honor UserPropertyDescriptor.isEnabled()

core/src/main/java/hudson/model/User.java

@@ -443,12 +443,15 @@ public class User extends AbstractModelObject implements AccessControlled, Savea
         List<UserProperty> props = new ArrayList<UserProperty>();
         int i = 0;
         for (UserPropertyDescriptor d : UserProperty.all()) {
-            JSONObject o = json.getJSONObject("userProperty" + (i++));
             UserProperty p = getProperty(d.clazz);
-            if (p != null) {
-                p = p.reconfigure(req, o);
-            } else {
-                p = d.newInstance(req, o);
+
+            JSONObject o = json.optJSONObject("userProperty" + (i++));
+            if (o!=null) {
+                if (p != null) {
+                    p = p.reconfigure(req, o);
+                } else {
+                    p = d.newInstance(req, o);
+                }
             }
 
             p.setUser(this);

core/src/main/resources/hudson/model/User/configure.jelly

@@ -42,14 +42,16 @@ THE SOFTWARE.
         <j:invokeStatic var="descriptors" className="hudson.model.UserProperty" method="all" />
         <j:set var="instances" value="${it.properties}" />
         <j:forEach var="d" items="${descriptors}" varStatus="loop">
-          <f:section title="${d.displayName}">
-            <j:set var="descriptor" value="${d}" />
-            <j:set var="instance" value="${instances[d]}" />
-            
-            <f:rowSet name="userProperty${loop.index}">
-              <st:include from="${d}" page="${d.configPage}"/>
-            </f:rowSet>
-          </f:section>
+          <j:if test="${d.enabled}">
+            <f:section title="${d.displayName}">
+              <j:set var="descriptor" value="${d}" />
+              <j:set var="instance" value="${instances[d]}" />
+
+              <f:rowSet name="userProperty${loop.index}">
+                <st:include from="${d}" page="${d.configPage}"/>
+              </f:rowSet>
+            </f:section>
+          </j:if>
         </j:forEach>
 
         <f:block>