Merge remote-tracking branch 'origin/2.2.x'

Author: OlgaMaciaszek

spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/reactive/ReactorLoadBalancerClientAutoConfiguration.java

@@ -23,6 +23,7 @@
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.cloud.client.loadbalancer.LoadBalanced;
 import org.springframework.context.annotation.Bean;
@@ -56,6 +57,7 @@ public ReactorLoadBalancerClientRibbonWarnLogger reactorLoadBalancerClientRibbon
 	@Conditional(OnNoRibbonDefaultCondition.class)
 	protected static class ReactorLoadBalancerExchangeFilterFunctionConfig {
 
+		@ConditionalOnMissingBean
 		@Bean
 		public ReactorLoadBalancerExchangeFilterFunction loadBalancerExchangeFilterFunction(
 				ReactiveLoadBalancer.Factory loadBalancerFactory) {