Use ErrorController.getErrorPath() to ignore the error path for security

Fixes gh-1548 again
Merge branch '1.1.x'
Remove inadvertently committed debug System.out
Fix failing tests
Backport Jetty/Tomcat SSL support

Fixes gh-1570
Cherry-picked from 0960908 and 258c6f1
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
Fix @Since tag
Merge branch '1.1.x'
Fix merge error
Make all @Bean methods public

Fixes gh-1571
Merge branch '1.1.x'
Merge missed documentation update

Cherry pick documentation updates which appear to have been
lost during a previous merge.

Fixes gh-1523
Cheery-picked from 16c2477d
Make all @Bean methods public

This is a continuation of the changes made in 611f978. It makes some
more @Bean methods public and adds tests to spring-boot-actuator and
spring-boot-autoconfigure to prevent against non-public methods being
introduced in the future

Closes gh-1571
Merge branch '1.1.x'
Call LoggerContext.reset() during logback init

Update `LogbackLoggingSystem` to call the `reset()` method on the
`LoggerContext` before initialization.

This will hopefully reset the context to prevent the same appenders
from being accidentally added more than once.

Fixes gh-1091
Merge branch '1.1.x'
Upgrade to Spring Framework 4.1.1.BUILD-SNAPSHOT
Add @Order annotations to conditions

Fixes gh-1574
Fix logic for identifying test classes on Windows

Use File.separator rather than hard-coding the use of ‘/‘

Closes gh-1571
Merge branch '1.1.x'