Merge branch '1.5.x'

spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc

@@ -5707,9 +5707,10 @@ how your tests will run:
   _any_ servlet environment (mock or otherwise).
 
 NOTE: If your test is `@Transactional`, it will rollback the transaction at the end of
-each test method by default. If you're using this arrangement in combination with either
+each test method by default. However, as using this arrangement with either `RANDOM_PORT`
-`RANDOM_PORT` or `DEFINED_PORT`, any transaction initiated on the server won't rollback as
+or `DEFINED_PORT` implicitly provides a real servlet environment, HTTP client and
-the test is running in a different thread than the server processing.
+server will run in separate threads, thus separate transactions. Any transaction
+initiated on the server won't rollback in this case.
 
 NOTE: In addition to `@SpringBootTest` a number of other annotations are also
 provided for testing more specific slices of an application. See below for details.