Merge branch '2.0.x' into 2.1.x

Closes gh-17078

spring-boot-samples/spring-boot-sample-devtools/src/main/java/sample/devtools/MyController.java

@@ -41,8 +41,7 @@ public class MyController {
 			sessionVar = new Date();
 			session.setAttribute("var", sessionVar);
 		}
-		ModelMap model = new ModelMap("message", Message.MESSAGE)
-				.addAttribute("sessionVar", sessionVar);
+		ModelMap model = new ModelMap("message", Message.MESSAGE).addAttribute("sessionVar", sessionVar);
 		return new ModelAndView("hello", model);
 	}