Merge remote-tracking branch 'origin/7.0.0' into 7.0.0--property-editor-guid-to-alias

Conflicts:
	src/Umbraco.Core/Configuration/LegacyUmbracoSettings.cs
	src/Umbraco.Core/Persistence/Migrations/Syntax/Alter/Expressions/AlterColumnExpression.cs
	src/Umbraco.Core/PropertyEditors/TinyMcePropertyEditorValueConverter.cs
	src/Umbraco.Core/XmlHelper.cs
	src/Umbraco.Tests/ObjectExtensionsTests.cs
	src/Umbraco.Web/PropertyEditors/RteMacroRenderingPropertyEditorValueConverter.cs
	src/Umbraco.Web/Routing/DefaultUrlProvider.cs
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/macro.cs

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

@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Serialization;
+using System.Text;
+using System.Threading.Tasks;
+using Umbraco.Core.Models.Validation;
+
+namespace Umbraco.Web.Models.ContentEditing
+{
+    public class MemberEntityBasic : EntityBasic
+    {
+        [DataMember(Name = "email", IsRequired = true)]
+        [RequiredForPersistence(AllowEmptyStrings = false, ErrorMessage = "Required")]
+        public string Email { get; set; }
+
+        [DataMember(Name = "loginName", IsRequired = true)]
+        [RequiredForPersistence(AllowEmptyStrings = false, ErrorMessage = "Required")]
+        public string LoginName { get; set; }
+    }
+}

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

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Umbraco.Web.Models.ContentEditing
+{
+    public class UserPasswordChange
+    {
+        public string OldPassword { get; set; }
+        public string NewPassword { get; set; }
+    }
+}