Merge branch '2.0.x' into 2.1.x

Closes gh-17268

Author: snicoll

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/ManagementServerProperties.java

@@ -66,7 +66,8 @@ public Integer getPort() {
 
 	/**
 	 * Sets the port of the management server, use {@code null} if the
-	 * {@link ServerProperties#getPort() server port} should be used. To disable use 0.
+	 * {@link ServerProperties#getPort() server port} should be used. Set to 0 to use a
+	 * random port or set to -1 to disable.
 	 * @param port the port
 	 */
 	public void setPort(Integer port) {