Merge branch '1.5.x' into 2.0.x

Author: wilkinsona

eclipse/spring-boot-project.setup

@@ -237,7 +237,7 @@
     <setupTask
         xsi:type="setup:PreferenceTask"
         key="/instance/org.eclipse.ui.editors/printMarginColumn"
-        value="90"/>
+        value="120"/>
     <setupTask
         xsi:type="setup:PreferenceTask"
         key="/instance/org.eclipse.ui.editors/lineNumberRuler"