Merge branch '1.1.x'

Conflicts:
	spring-boot-samples/spring-boot-sample-tomcat-ssl/pom.xml
	spring-boot-samples/spring-boot-sample-tomcat-ssl/src/test/java/sample/tomcat/SampleTomcatSslApplicationTests.java
	spring-boot/src/main/java/org/springframework/boot/context/embedded/ConfigurableEmbeddedServletContainer.java
	spring-boot/src/main/java/org/springframework/boot/context/embedded/Ssl.java

spring-boot/src/main/java/org/springframework/boot/context/embedded/AbstractConfigurableEmbeddedServletContainer.java

@@ -258,6 +258,15 @@ public abstract class AbstractConfigurableEmbeddedServletContainer implements
 		this.jspServletClassName = jspServletClassName;
 	}
 
+	@Override
+	public void setSsl(Ssl ssl) {
+		this.ssl = ssl;
+	}
+
+	public Ssl getSsl() {
+		return this.ssl;
+	}
+
 	/**
 	 * @return the JSP servlet class name
 	 */

spring-boot/src/main/java/org/springframework/boot/context/embedded/ConfigurableEmbeddedServletContainer.java

@@ -145,4 +145,5 @@ public interface ConfigurableEmbeddedServletContainer {
 	 * @param ssl the SSL configuration
 	 */
 	void setSsl(Ssl ssl);
+
 }

spring-boot/src/main/java/org/springframework/boot/context/embedded/Ssl.java

@@ -21,7 +21,7 @@ package org.springframework.boot.context.embedded;
  *
  * @author Andy Wilkinson
  * @author Vladimir Tsanev
- * @since 1.2.0
+ * @since 1.1.7
  */
 public class Ssl {
 
@@ -158,4 +158,5 @@ public class Ssl {
 	public enum ClientAuth {
 		WANT, NEED;
 	}
+
 }