Merge branch '2.2.x'

Closes gh-19930

Author: snicoll

spring-boot-project/spring-boot-parent/build.gradle

@@ -12,7 +12,7 @@ javaPlatform {
 
 dependencies {
 	api(enforcedPlatform(project(":spring-boot-project:spring-boot-dependencies")))
-	api(enforcedPlatform("org.testcontainers:testcontainers-bom:1.12.4"))
+	api(enforcedPlatform("org.testcontainers:testcontainers-bom:1.12.5"))
 
 	constraints {
 		api("com.vaadin.external.google:android-json:0.0.20131108.vaadin1")