Merge branch 'client-interceptor-hook'

Conflicts:
	brave-client/src/main/java/com/github/kristofa/brave/client/ClientRequestInterceptor.java
changed visibility of getServiceName and getSpanName to "protected"
Merge branch 'client-interceptor-hook'
Merge branch 'master' into zalando-releases

Conflicts:
	brave-client/src/main/java/com/github/kristofa/brave/client/ClientRequestInterceptor.java