Merge branch '2.1.x'

Closes gh-17764

Author: snicoll

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cassandra/CassandraReactiveHealthIndicatorAutoConfiguration.java

@@ -54,7 +54,7 @@ public class CassandraReactiveHealthIndicatorAutoConfiguration extends
 		CompositeReactiveHealthIndicatorConfiguration<CassandraReactiveHealthIndicator, ReactiveCassandraOperations> {
 
 	@Bean
-	@ConditionalOnMissingBean(name = "cassandraReactiveHealthIndicator")
+	@ConditionalOnMissingBean(name = "cassandraHealthIndicator")
 	public ReactiveHealthIndicator cassandraHealthIndicator(
 			Map<String, ReactiveCassandraOperations> reactiveCassandraOperations) {
 		return createHealthIndicator(reactiveCassandraOperations);