Add config server prefix support to config discovery
Connect Feign to resilient Ribbon client
Merge remote-tracking branch 'upstream/master'

Conflicts:
	spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/config/DiscoveryClientConfigServiceBootstrapConfiguration.java
	spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignAutoConfiguration.java
updated turbine docs to show the need to uppercase turbine.aggregator.clusterConfig

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

fixes gh-112
Merge remote-tracking branch 'upstream/master'
Make zuul proxy route filter retriable