Adapt ZipkinSpanCollector to be compatible with the brave 2.0-SNAPSHOT changes.

We use the Zipkin core thrift generated classes now as part of the
Brave api. The adapted Span Collector now uses these and relies only on
Thrift not on the Twitter scala dependencies anymore.
Solve merge conflict on pom.xml