Merge branch 'netcore/netcore' into feature/8651-config-options-patten

# Conflicts:
#	src/Umbraco.Tests.Common/Builders/GlobalSettingsBuilder.cs
#	src/Umbraco.Tests/TEMP/DatabaseContextTests.sdf
#	src/Umbraco.Web.BackOffice/Controllers/ImagesController.cs

src/Umbraco.Configuration/Legacy/GlobalSettings.cs

@@ -146,6 +146,9 @@ namespace Umbraco.Core.Configuration.Legacy
             }
         }
 
+
+
+
         /// <summary>
         /// Gets or sets the configuration status. This will return the version number of the currently installed umbraco instance.
         /// </summary>
@@ -315,6 +318,15 @@ namespace Umbraco.Core.Configuration.Legacy
         private string _databaseFactoryServerVersion;
         public string DatabaseFactoryServerVersion => GetterWithDefaultValue(Constants.AppSettings.Debug.DatabaseFactoryServerVersion, string.Empty, ref _databaseFactoryServerVersion);
 
+
+
+        private string _iconsPath;
+        /// <summary>
+        /// Gets the path to folder containing the icons used in the umbraco backoffice (/umbraco/assets/icons by default).
+        /// </summary>
+        /// <value>The icons path.</value>
+        public string IconsPath => GetterWithDefaultValue(Constants.AppSettings.IconsPath, $"{UmbracoPath}/assets/icons", ref _iconsPath);
+
         private string _mainDomLock;
 
         public string MainDomLock => GetterWithDefaultValue(Constants.AppSettings.MainDomLock, string.Empty, ref _mainDomLock);

src/Umbraco.Configuration/Models/GlobalSettings.cs

@@ -47,6 +47,8 @@ namespace Umbraco.Configuration.Models
         public bool UseHttps => _configuration.GetValue(Prefix + "UseHttps", false);
         public int VersionCheckPeriod => _configuration.GetValue(Prefix + "VersionCheckPeriod", 7);
         public string UmbracoPath => _configuration.GetValue(Prefix + "UmbracoPath", "~/umbraco");
+        public string IconsPath => _configuration.GetValue(Prefix + "IconsPath", $"{UmbracoPath}/assets/icons");
+
         public string UmbracoCssPath => _configuration.GetValue(Prefix + "UmbracoCssPath", "~/css");
 
         public string UmbracoScriptsPath =>