Merge branch '1.4.x' into 1.5.x

spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ManagementServerPropertiesAutoConfigurationNoSecurityTests.java

@@ -48,17 +48,16 @@ public class ManagementServerPropertiesAutoConfigurationNoSecurityTests {
 
 	@Test
 	public void securitySettingsIgnoredWithoutSpringSecurity() {
-		ManagementServerProperties properties =
-				load("management.security.enabled=false");
+		ManagementServerProperties properties = load("management.security.enabled=false");
 		assertThat(properties.getSecurity().isEnabled()).isFalse();
 	}
 
 	public ManagementServerProperties load(String... environment) {
-		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
-		EnvironmentTestUtils.addEnvironment(ctx, environment);
-		ctx.register(ManagementServerPropertiesAutoConfiguration.class);
-		ctx.refresh();
-		this.context = ctx;
+		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
+		EnvironmentTestUtils.addEnvironment(context, environment);
+		context.register(ManagementServerPropertiesAutoConfiguration.class);
+		context.refresh();
+		this.context = context;
 		return this.context.getBean(ManagementServerProperties.class);
 	}
 

spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/MockMvcAutoConfiguration.java

@@ -51,6 +51,7 @@ import org.springframework.web.servlet.DispatcherServlet;
 public class MockMvcAutoConfiguration {
 
 	private final WebApplicationContext context;
+
 	private final WebMvcProperties webMvcProperties;
 
 	MockMvcAutoConfiguration(WebApplicationContext context,