Completes: U4-3212 Support unlocking a member, also fixes quite a few other issues regarding the membership provider properties of the content type.

src/Umbraco.Web/Models/ContentEditing/MemberDisplay.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Runtime.Serialization;
 using Umbraco.Core.Models;
 
@@ -10,12 +11,24 @@ namespace Umbraco.Web.Models.ContentEditing
     [DataContract(Name = "content", Namespace = "")]
     public class MemberDisplay : ContentItemDisplayBase<ContentPropertyDisplay, IMember>
     {
+        public MemberDisplay()
+        {
+            MemberProviderFieldMapping = new Dictionary<string, string>();
+        }
 
         [DataMember(Name = "username")]
         public string Username { get; set; }
 
         [DataMember(Name = "email")]
         public string Email { get; set; }
+
+        /// <summary>
+        /// This is used to indicate how to map the membership provider properties to the save model, this mapping
+        /// will change if a developer has opted to have custom member property aliases specified in their membership provider config, 
+        /// or if we are editing a member that is not an Umbraco member (custom provider)
+        /// </summary>
+        [DataMember(Name = "fieldConfig")]
+        public IDictionary<string, string> MemberProviderFieldMapping { get; set; }
         
     }
 }