Merge remote-tracking branch 'origin/master' into 2.0.x

spring-cloud-commons/src/main/java/org/springframework/cloud/client/serviceregistry/AutoServiceRegistrationProperties.java

@@ -11,6 +11,17 @@ public class AutoServiceRegistrationProperties {
 	/** If Auto-Service Registration is enabled, default to true. */
 	private boolean enabled = true;
 
+	/** Whether to register the management as a service, defaults to true */
+	private boolean registerManagement = true;
+
+	public boolean shouldRegisterManagement() {
+		return registerManagement;
+	}
+
+	public void setRegisterManagement(boolean registerManagement) {
+		this.registerManagement = registerManagement;
+	}
+
 	/** Should startup fail if there is no AutoServiceRegistration, default to false. */
 	private boolean failFast = false;