Merge branch '1.5.x' into 2.0.x

Author: wilkinsona

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/context/ServletWebServerApplicationContextTests.java

@@ -570,18 +570,4 @@ public ServletRequest getRequest() {
 
 	}
 
-	protected static class WithAutowiredServletContext {
-
-		private final ServletContext context;
-
-		public WithAutowiredServletContext(ServletContext context) {
-			this.context = context;
-		}
-
-		public ServletContext getContext() {
-			return this.context;
-		}
-
-	}
-
 }