Merge branch '6.0.x'

spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/annotation/QualifierConfiguration.java

@@ -45,7 +45,7 @@ public class QualifierConfiguration {
 		@Bean
 		@Qualifier("2")
 		public String two() {
-			return "one";
+			return "two";
 		}
 
 	}