Merge branch '3.4.x' into 3.5.x

Closes gh-46769

Author: snicoll

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ssl/SslOptions.java

@@ -49,15 +49,15 @@ default boolean isSpecified() {
 	}
 
 	/**
-	 * Return the ciphers that can be used or an empty set. The cipher names in this set
+	 * Return the ciphers that can be used or {@code null}. The cipher names in this set
 	 * should be compatible with those supported by
 	 * {@link SSLEngine#getSupportedCipherSuites()}.
 	 * @return the ciphers that can be used or {@code null}
 	 */
 	String[] getCiphers();
 
 	/**
-	 * Return the protocols that should be enabled or an empty set. The protocols names in
+	 * Return the protocols that should be enabled or {@code null}. The protocols names in
 	 * this set should be compatible with those supported by
 	 * {@link SSLEngine#getSupportedProtocols()}.
 	 * @return the protocols to enable or {@code null}