Merge branch '3.0.x' into 3.1.x

Closes gh-37408

Author: wilkinsona

spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/testcontainers/DockerImageNames.java

@@ -162,7 +162,7 @@ public static DockerImageName postgresql() {
 
 	/**
 	 * Return a {@link DockerImageName} suitable for running RabbitMQ.
-	 * @return a docker image name for running redis
+	 * @return a docker image name for running RabbitMQ
 	 */
 	public static DockerImageName rabbit() {
 		return DockerImageName.parse("rabbitmq").withTag(RABBIT_VERSION);