Merge branch '2.0.x'

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerAutoConfigurationServletIntegrationTests.java

@@ -112,8 +112,7 @@ public class FreeMarkerAutoConfigurationServletIntegrationTests {
 
 	@Test
 	public void customTemplateLoaderPath() throws Exception {
-		load(
+		load("spring.freemarker.templateLoaderPath:classpath:/custom-templates/");
-				"spring.freemarker.templateLoaderPath:classpath:/custom-templates/");
 		MockHttpServletResponse response = render("custom");
 		String result = response.getContentAsString();
 		assertThat(result).contains("custom");