* cleanup-test-duplicates: Update Apache license headers for affected sources Remove duplicate test classes Replace test beans with test objects Conflicts: spring-beans/src/test/java/org/springframework/beans/factory/ConcurrentBeanFactoryTests.java spring-beans/src/test/java/org/springframework/beans/support/PagedListHolderTests.java