Merge branch '3.5.x' into 4.0.x

See gh-49385

module/spring-boot-elasticsearch/src/dockerTest/resources/org/springframework/boot/elasticsearch/docker/compose/elasticsearch-ssl-compose.yaml

@@ -20,6 +20,8 @@ services:
       -u elastic:secret https://localhost:9200/_cluster/health || exit 1"]
       interval: 5s
       retries: 5
+      start_period: 60s
+      timeout: 10s
     labels:
       - 'org.springframework.boot.sslbundle.pem.keystore.certificate=client.crt'
       - 'org.springframework.boot.sslbundle.pem.keystore.private-key=client.key'