Merge branch '1.5.x' into 2.0.x

spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc

@@ -7503,8 +7503,9 @@ on auto-configuration classes (since these are guaranteed to load after any user
 bean definitions have been added).
 
 NOTE: `@ConditionalOnBean` and `@ConditionalOnMissingBean` do not prevent `@Configuration`
-classes from being created. Using these conditions at the class level is equivalent to
-marking each contained `@Bean` method with the annotation.
+classes from being created. The only difference between using these conditions at the class level
+and marking each contained `@Bean` method with the annotation is that the former prevents
+registration of the `@Configuration` class as a bean if the condition does not match.