Bjarke Berg
69b8b64b54
Merge remote-tracking branch 'origin/v8/dev' into v9/feature/merge_v8_14-12-2021
# Conflicts:
# src/Umbraco.Core/Constants-Conventions.cs
# src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
# src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
# src/Umbraco.Core/Models/IContentType.cs
# src/Umbraco.Core/Packaging/PackageDataInstallation.cs
# src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeCommonRepository.cs
# src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepository.cs
# src/Umbraco.Core/Persistence/Repositories/Implement/MemberTypeRepository.cs
# src/Umbraco.Core/Services/Implement/EntityXmlSerializer.cs
# src/Umbraco.Core/Services/Implement/MemberService.cs
# src/Umbraco.Tests/Packaging/PackageDataInstallationTests.cs
# src/Umbraco.Tests/Persistence/Repositories/MemberTypeRepositoryTest.cs
# src/Umbraco.Tests/Services/Importing/ImportResources.Designer.cs
# src/Umbraco.Tests/Services/Importing/ImportResources.resx
# src/Umbraco.Tests/Umbraco.Tests.csproj
# src/Umbraco.Web.UI.Client/src/common/directives/components/localization/localize.directive.js
# src/Umbraco.Web.UI.Client/src/common/services/umbdataformatter.service.js
# src/Umbraco.Web.UI.Client/src/views/content/content.rights.controller.js
# src/Umbraco.Web.UI.Client/src/views/documenttypes/views/permissions/permissions.html
# src/Umbraco.Web.UI.Client/src/views/member/apps/content/content.html
# src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
# src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
# src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
# src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
# src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml
# src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml
# src/Umbraco.Web.UI/Umbraco/config/lang/zh.xml
# src/Umbraco.Web.UI/config/BackOfficeTours/getting-started.json
# src/Umbraco.Web/HealthCheck/Checks/Security/ExcessiveHeadersCheck.cs
# src/Umbraco.Web/Models/ContentEditing/MemberDisplay.cs
# src/Umbraco.Web/Models/Mapping/ContentTypeMapDefinition.cs
# src/Umbraco.Web/Models/Mapping/MemberMapDefinition.cs
# src/Umbraco.Web/Models/Mapping/MemberTabsAndPropertiesMapper.cs
# src/Umbraco.Web/Models/Mapping/TabsAndPropertiesMapper.cs
# src/Umbraco.Web/PropertyEditors/BlockEditorPropertyEditor.cs
# src/Umbraco.Web/Runtime/WebInitialComposer.cs
# src/Umbraco.Web/Trees/ContentTreeController.cs
# src/Umbraco.Web/Umbraco.Web.csproj
# tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/Services/Importing/SingleDocType-WithCleanupPolicy.xml