Merge branch '2.1.x'

spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientAutoConfiguration.java

@@ -57,6 +57,7 @@ public class KubernetesDiscoveryClientAutoConfiguration {
 
 		@Bean
 		@ConditionalOnMissingClass("org.springframework.web.reactive.function.client.WebClient")
+		@ConditionalOnMissingBean(RestTemplate.class)
 		public RestTemplate restTemplate() {
 			return new RestTemplateBuilder().build();
 		}