Merge branch '3.3.x' into 3.4.x

Author: philwebb

eclipse/spring-boot-project.setup

@@ -72,14 +72,6 @@
         name="org.eclipse.jdt.feature.group"/>
     <requirement
         name="io.spring.javaformat.eclipse.feature.feature.group"/>
-    <requirement
-        name="org.eclipse.jst.server_adapters.feature.feature.group"/>
-    <requirement
-        name="org.eclipse.jst.server_adapters.ext.feature.feature.group"/>
-    <requirement
-        name="org.eclipse.jst.server_ui.feature.feature.group"/>
-    <requirement
-        name="org.eclipse.jst.web_ui.feature.feature.group"/>
     <requirement
         name="org.eclipse.m2e.feature.feature.group"/>
     <requirement
@@ -99,7 +91,7 @@
     <repository
         url="https://repo.maven.apache.org/maven2/.m2e/connectors/m2eclipse-buildhelper/0.15.0/N/0.15.0.201405280027/"/>
     <repository
-        url="https://download.eclipse.org/buildship/updates/e411/releases/"/>
+        url="https://download.eclipse.org/buildship/updates/e49/releases/"/>
     <description>
       Install the tools needed in the IDE to work with the
       source code for ${scope.project.label}