Merge branch '2.1.x'

Author: snicoll

spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/jdbc/JdbcTest.java

@@ -46,8 +46,8 @@
  * Using this annotation will disable full auto-configuration and instead apply only
  * configuration relevant to jdbc tests.
  * <p>
- * By default, tests annotated with {@code @JdbcTest} are transactional and roll back
- * at the end of each test. They also use an embedded in-memory database (replacing any
+ * By default, tests annotated with {@code @JdbcTest} are transactional and roll back at
+ * the end of each test. They also use an embedded in-memory database (replacing any
  * explicit or usually auto-configured DataSource). The
  * {@link AutoConfigureTestDatabase @AutoConfigureTestDatabase} annotation can be used to
  * override these settings.