Bjarke Berg
52a3e285a9
Merge remote-tracking branch 'origin/v8/dev' into v9/dev
# Conflicts:
# src/Umbraco.Core/Composing/CompositionExtensions/Services.cs
# src/Umbraco.Core/Constants-AppSettings.cs
# src/Umbraco.Core/Dashboards/ContentDashboardSettings.cs
# src/Umbraco.Core/Dashboards/IContentDashboardSettings.cs
# src/Umbraco.Core/Manifest/ManifestParser.cs
# src/Umbraco.Core/Manifest/PackageManifest.cs
# src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
# src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
# src/Umbraco.Core/Models/PropertyTagsExtensions.cs
# src/Umbraco.Core/PropertyEditors/ComplexPropertyEditorContentEventHandler.cs
# src/Umbraco.Core/PropertyEditors/ConfigurationEditor.cs
# src/Umbraco.Core/PropertyEditors/DataValueEditor.cs
# src/Umbraco.Core/PropertyEditors/ValueConverters/ImageCropperValue.cs
# src/Umbraco.Core/Serialization/JsonToStringConverter.cs
# src/Umbraco.Core/Sync/ApplicationUrlHelper.cs
# src/Umbraco.Core/Telemetry/ITelemetryService.cs
# src/Umbraco.Core/Telemetry/Models/PackageTelemetry.cs
# src/Umbraco.Core/Telemetry/Models/TelemetryReportData.cs
# src/Umbraco.Core/Telemetry/TelemetryService.cs
# src/Umbraco.Tests/Manifest/ManifestParserTests.cs
# src/Umbraco.Tests/PropertyEditors/BlockEditorComponentTests.cs
# src/Umbraco.Tests/PropertyEditors/ImageCropperTest.cs
# src/Umbraco.Tests/PropertyEditors/NestedContentPropertyComponentTests.cs
# src/Umbraco.Tests/Web/Controllers/AuthenticationControllerTests.cs
# src/Umbraco.Tests/Web/Controllers/UsersControllerTests.cs
# src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
# 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/web.Template.config
# src/Umbraco.Web/BatchedDatabaseServerMessenger.cs
# src/Umbraco.Web/Cache/DistributedCacheBinder.cs
# src/Umbraco.Web/Compose/BlockEditorComponent.cs
# src/Umbraco.Web/Compose/NestedContentPropertyComponent.cs
# src/Umbraco.Web/Editors/AuthenticationController.cs
# src/Umbraco.Web/Editors/ContentTypeController.cs
# src/Umbraco.Web/Editors/DashboardController.cs
# src/Umbraco.Web/Editors/EntityController.cs
# src/Umbraco.Web/Editors/UsersController.cs
# src/Umbraco.Web/PropertyEditors/BlockEditorPropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/ColorPickerConfigurationEditor.cs
# src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/ImageCropperPropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/ImageCropperPropertyValueEditor.cs
# src/Umbraco.Web/PropertyEditors/MediaPicker3PropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/MultiUrlPickerValueEditor.cs
# src/Umbraco.Web/PropertyEditors/MultipleTextStringPropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/MultipleValueEditor.cs
# src/Umbraco.Web/PropertyEditors/NestedContentPropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/TagsPropertyEditor.cs
# src/Umbraco.Web/Telemetry/ReportSiteTask.cs
# src/Umbraco.Web/Telemetry/TelemetryComponent.cs
# src/Umbraco.Web/Trees/ContentTreeController.cs
# src/Umbraco.Web/Umbraco.Web.csproj
# src/Umbraco.Web/WebApi/EnableDetailedErrorsAttribute.cs