Conflicts: src/Umbraco.Core/Umbraco.Core.csproj src/Umbraco.Core/Xml/XmlNodeExtensions.cs src/Umbraco.Web.UI/config/ClientDependency.config src/Umbraco.Web.UI/config/Dashboard.config src/Umbraco.Web/DefaultPublishedContentStore.cs src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/moveOrCopy.aspx.cs src/umbraco.businesslogic/BasePages/BasePage.cs