Merge branch '5.3.x'

# Conflicts:
#	spring-context/src/main/java/org/springframework/scheduling/annotation/Async.java
#	spring-context/src/testFixtures/java/org/springframework/context/testfixture/jndi/SimpleNamingContextBuilder.java
#	spring-core/src/main/java/org/springframework/core/BridgeMethodResolver.java
#	spring-core/src/main/java/org/springframework/util/MimeType.java

spring-context-indexer/src/test/java/org/springframework/context/index/sample/SampleNonStaticEmbedded.java

@@ -19,7 +19,7 @@ package org.springframework.context.index.sample;
 import org.springframework.stereotype.Component;
 
 /**
- * Candidate with a inner class that isn't static (and should therefore not be added).
+ * Candidate with an inner class that isn't static (and should therefore not be added).
  *
  * @author Stephane Nicoll
  */