Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB3970-membership-providers

# Conflicts:
#	src/Umbraco.Web/Editors/Filters/MemberSaveModelValidator.cs
#	src/Umbraco.Web/Editors/Filters/MemberSaveValidationAttribute.cs

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

@@ -11,10 +11,17 @@ namespace Umbraco.Web.Models.ContentEditing
     internal class ContentPropertyDto : ContentPropertyBasic
     {
         public IDataType DataType { get; set; }
+
         public string Label { get; set; }
+
         public string Description { get; set; }
+
         public bool IsRequired { get; set; }
+
+        public string IsRequiredMessage { get; set; }
+
         public string ValidationRegExp { get; set; }
 
+        public string ValidationRegExpMessage { get; set; }
     }
 }

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

@@ -11,7 +11,13 @@ namespace Umbraco.Web.Models.ContentEditing
         [DataMember(Name = "mandatory")]
         public bool Mandatory { get; set; }
 
+        [DataMember(Name = "mandatoryMessage")]
+        public string MandatoryMessage { get; set; }
+
         [DataMember(Name = "pattern")]
         public string Pattern { get; set; }
+
+        [DataMember(Name = "patternMessage")]
+        public string PatternMessage { get; set; }
     }
 }