use different bean names for Hystrix and HystrixStream features (#1470)

Fixes gh-1462

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixCircuitBreakerConfiguration.java

@@ -82,7 +82,7 @@ public class HystrixCircuitBreakerConfiguration {
 		}
 
 		@Bean
-		public HasFeatures hystrixFeature() {
+		public HasFeatures hystrixStreamFeature() {
 			return HasFeatures.namedFeature("Hystrix Stream Servlet", HystrixStreamEndpoint.class);
 		}
 	}