Merge branch '2.0.x'

spring-cloud-bus/src/main/java/org/springframework/cloud/bus/BusAutoConfiguration.java

@@ -195,9 +195,9 @@ public class BusAutoConfiguration implements ApplicationEventPublisherAware {
 
 		@Configuration
 		@ConditionalOnBean(ContextRefresher.class)
-		@ConditionalOnProperty(value = "endpoints.spring.cloud.bus.refresh.enabled", matchIfMissing = true)
 		protected static class BusRefreshEndpointConfiguration {
 			@Bean
+			@ConditionalOnEnabledEndpoint
 			public RefreshBusEndpoint refreshBusEndpoint(ApplicationContext context,
 					BusProperties bus) {
 				return new RefreshBusEndpoint(context, bus.getId());