Merge branch '4.1.x'

core/spring-boot-test/src/main/java/org/springframework/boot/test/context/PropertyMapping.java

@@ -42,7 +42,6 @@ import org.springframework.test.context.TestPropertySource;
  * }
  * </pre> will result in a {@literal my.example.name} property being added with the value
  * {@literal "Spring"}.
- * <p>
  *
  * @author Phillip Webb
  * @since 4.0.0

core/spring-boot-test/src/main/java/org/springframework/boot/test/context/runner/AbstractApplicationContextRunner.java

@@ -96,7 +96,6 @@ import org.springframework.util.CollectionUtils;
  *         // other assertions
  *     });
  * }</pre>
- * <p>
  *
  * @param <SELF> the "self" type for this runner
  * @param <C> the context type