Conflicts:
	spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignClient.java
	spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignClientScan.java
	spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/route/RibbonRoutingFilter.java
	spring-cloud-netflix-turbine-amqp/src/test/java/org/springframework/cloud/netflix/turbine/amqp/AggregatorTest.java

This change adds an ApplicationListener that sets some high priority
properties in the Environment to allow server.port and management.port
to keep their usual meaning, but have server.port apply only to turbine.
Actuator endpoints can be enabled with management.port (different to
server.port otherwise there will be a conflict between Netty and Tomcat).

Fixes gh-143, fixes gh-140

Fixes gh-151

Fixes gh-156

fixes gh-129

fixes gh-135

created hystrix.stream.amqp.send-id to allow disabling of sending the context id as the metric id.  Turbine AMQP then defaults to serviceId:host:port

fixes gh-131

Now they match better what the vanilla /trace data does in terms of
object and field names.

Not used by the app itself, but will show up in metadata reports
and in tooling, so useful for documentation purposes.

See gh-125

Fixes gh-125

Fixes gh-126

It's nice to have an annotation to say "I want Eureka discovery".
At the moment it is a pass thru for @EnableDiscoveryClient, but
in principle it could be used to select Eureka over another provider
even if both were on the classpath.

Fixes gh-113

Fixes gh-122

If the ClientFactory from netflix is used directly it bypasses
all the goodness in SpringClientFactory, so clients created
in Feign before this change were getting the default native
configuration instead of that provided by
RibbonClientConfiguration.

There are no remaining references to the raw ClientFactory in
Spring Cloud, so we probably have seen the last of this.

Fixes gh-118

Fixes gh-117

add some hystrix tests, specifically check there is no discovery health indicator if it is not turned on

fixes gh-112

fixes gh-84

With just a bit more hackery on the Zuul request wrapper we can mask
off the input stream and content lengths, and fix them so they contain
the expected content. Doesn't work (yet) for multipart content.

Fixes gh-109