Merge pull request #1 from jgallimore/zipkin-v2

GERONIMO-6727 Zipkin v2 changes