Conflicts:
	spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/zuul/filters/route/okhttp/OkHttpRibbonCommandIntegrationTests.java

FormBodyWrapperFilter may add multiples of every multipart part to a request

Migrate tests to Spring Boot Test 1.4

Changed version and group id to use latest OpenFeign release

Fixes gh-1214

Fixed an issue where the pre FormBodyWrapperFilter adds multiples of every multipart part to a request

Fixes gh-1205

We need to still assert that the FeignClient is valid (no name and
value specified together for instance). Added missing tests.

There is a utility method in Spring that we can use to merge all
the aliases. That way 4.2 and 4.3 behave the same way.

Fixes gh-1192

Need to make this class 4.2.x compatible.

see gh-1192

Disable cookie management for RibbonLoadBalancingHttpClient Fixes gh-301

See gh-1105

Upgrade Eureka to 1.4.10.  Fixes #1180.

fixes gh-1175

remove Guava ImmutableMap in favour of Collections.unmodifiab…

fixes gh-1155

Make sanitizeUrlTemplate() protected for easy sub-classing

fixes gh-1143

* orchit-master:
  Adds ability to disable hostname validation.

Adds property zuul.sslHostnameValidationEnabled to be able to disable the hostname validation in the simpleHostRoutingFilter

fixes gh-1057

This allows developers to customize the request builders for zuul requests to inject headers or modify the request in general.  Each zuul request type (RestClient, Apache HttpClient and OkHttp) is supported.

fixes gh-1141

Previously ProxyRequestHelper contained a TraceRepository field. This caused zuul apps to fail with a class not found exception if they excluded actuator. This splits TraceRepository functionality into a new TraceProxyRequestHelper that extends ProxyRequestHelper. Auto configuration creates the appropriate ProxyRequestHelper based on the existence or not of actuator classes.

fixes gh-1135