Merge branch 'v8/8.6' into v8/8.7

# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Runtime/SqlMainDomLock.cs
#	src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour.directive.js
#	src/Umbraco.Web.UI.Client/src/common/services/clipboard.service.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js

src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour.directive.js

@@ -11,7 +11,7 @@ You can easily add you own tours to the Help-drawer or show and start tours from
 anywhere in the Umbraco backoffice. To see a real world example of a custom tour implementation, install <a href="https://our.umbraco.com/projects/starter-kits/the-starter-kit/">The Starter Kit</a> in Umbraco 7.8
 
 <h1><b>Extending the help drawer with custom tours</b></h1>
-The easiet way to add new tours to Umbraco is through the Help-drawer. All it requires is a my-tour.json file. 
+The easiet way to add new tours to Umbraco is through the Help-drawer. All it requires is a my-tour.json file.
 Place the file in <i>App_Plugins/{MyPackage}/backoffice/tours/{my-tour}.json</i> and it will automatically be
 picked up by Umbraco and shown in the Help-drawer.
 
@@ -277,7 +277,6 @@ In the following example you see how to run some custom logic before a step goes
                     }
 
                     startStep();
-                    // tour completed - final step
                 } else {
                     // tour completed - final step
                     scope.loadingStep = true;

src/Umbraco.Web.UI.Client/src/common/services/clipboard.service.js

@@ -129,6 +129,21 @@ function clipboardService(notificationsService, eventsService, localStorageServi
     };
 
 
+    /**
+    * @ngdoc method
+    * @name umbraco.services.clipboardService#registrerPropertyClearingResolver
+    * @methodOf umbraco.services.clipboardService
+    *
+    * @param {string} function A method executed for every property and inner properties copied.
+    *
+    * @description
+    * Executed for all properties including inner properties when performing a copy action.
+    */
+   service.registrerClearPropertyResolver = function(resolver) {
+        clearPropertyResolvers.push(resolver);
+    };
+
+
     /**
     * @ngdoc method
     * @name umbraco.services.clipboardService#copy