Merge branch '3.1.x' into 3.2.x

Closes gh-39449

spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/properties/TestcontainersPropertySource.java

@@ -129,7 +129,7 @@ static TestcontainersPropertySource getOrAdd(ConfigurableEnvironment environment
 			return getOrAdd(environment);
 		}
 		Assert.state(propertySource instanceof TestcontainersPropertySource,
-				"Incorrect DynamicValuesPropertySource type registered");
+				"Incorrect TestcontainersPropertySource type registered");
 		return ((TestcontainersPropertySource) propertySource);
 	}