Merge branch '5.1.x'

spring-context-indexer/src/main/java/org/springframework/context/index/processor/TypeHelper.java

@@ -115,7 +115,7 @@ class TypeHelper {
 			return this.env.getElementUtils().getAllAnnotationMirrors(e);
 		}
 		catch (Exception ex) {
-			// This may fail if one of the annotation is not available
+			// This may fail if one of the annotations is not available.
 			return Collections.emptyList();
 		}
 	}

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

@@ -20,7 +20,7 @@ import javax.transaction.Transactional;
 
 /**
  * Test candidate for {@link Transactional}. This verifies that the annotation processor
- * can process an annotation that declares itself an annotation that is not on the
+ * can process an annotation that declares itself with an annotation that is not on the
  * classpath.
  *
  * @author Vedran Pavic