Merge branch '2.3.x' into 2.4.x

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/rsocket/RSocketServerAutoConfiguration.java

@@ -65,7 +65,7 @@ public class RSocketServerAutoConfiguration {
 
 	@Conditional(OnRSocketWebServerCondition.class)
 	@Configuration(proxyBeanMethods = false)
-	static class WebFluxServerAutoConfiguration {
+	static class WebFluxServerConfiguration {
 
 		@Bean
 		@ConditionalOnMissingBean
@@ -80,7 +80,7 @@ public class RSocketServerAutoConfiguration {
 	@ConditionalOnProperty(prefix = "spring.rsocket.server", name = "port")
 	@ConditionalOnClass(ReactorResourceFactory.class)
 	@Configuration(proxyBeanMethods = false)
-	static class EmbeddedServerAutoConfiguration {
+	static class EmbeddedServerConfiguration {
 
 		@Bean
 		@ConditionalOnMissingBean