Merge branch '2.1.x' into 2.2.x

Author: mbhave

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/server/SslConfigurationValidatorTest.java renamed to spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/server/SslConfigurationValidatorTests.java

@@ -32,7 +32,7 @@
  * @author Chris Bono
  */
 
-public class SslConfigurationValidatorTest {
+class SslConfigurationValidatorTests {
 
 	private static final String VALID_ALIAS = "test-alias";