Merge branch '6.2.x'

Author: sbrannen

Diff for: spring-test/src/main/java/org/springframework/test/context/NestedTestConfiguration.java

@@ -75,6 +75,7 @@
  * <ul>
  * <li>{@link BootstrapWith @BootstrapWith}</li>
  * <li>{@link TestExecutionListeners @TestExecutionListeners}</li>
+ * <li>{@link ContextCustomizerFactories @ContextCustomizerFactories}</li>
  * <li>{@link ContextConfiguration @ContextConfiguration}</li>
  * <li>{@link ContextHierarchy @ContextHierarchy}</li>
  * <li>{@link org.springframework.test.context.web.WebAppConfiguration @WebAppConfiguration}</li>