Merge branch '7.0.x'

# Conflicts:
#	spring-context/src/test/java/org/springframework/context/support/GenericApplicationContextTests.java