Merge branch '1.1.x'

Conflicts:
	spring-boot-docs/src/main/asciidoc/howto.adoc

spring-boot-tools/spring-boot-gradle-plugin/src/main/groovy/org/springframework/boot/gradle/run/RunPluginFeatures.java

@@ -78,10 +78,7 @@ public class RunPluginFeatures implements PluginFeatures {
 				if (project.hasProperty("applicationDefaultJvmArgs")) {
 					return project.property("applicationDefaultJvmArgs");
 				}
-				else {
-					return Collections.emptyList();
-				}
-
+				return Collections.emptyList();
 			}
 		});
 	}