Merge remote-tracking branch 'origin/7.0.0' into 7.0.0-pubcontent

src/Umbraco.Core/ObjectResolution/Resolution.cs

@@ -126,7 +126,7 @@ namespace Umbraco.Core.ObjectResolution
         /// <remarks>To be used in unit tests.</remarks>
         internal static void Reset()
         {
-            LogHelper.Debug(typeof(DirtyBackdoor), "Resetting resolution");
+            LogHelper.Debug(typeof(Resolution), "Resetting resolution");
 
             using (new WriteLock(ConfigurationLock))
             {

src/umbraco.cms/Actions/Action.cs

@@ -57,7 +57,7 @@ namespace umbraco.BusinessLogic.Actions
                 using (Umbraco.Core.ObjectResolution.Resolution.DirtyBackdoorToConfiguration)
                 {
                     //TODO: Based on the above, this is a big hack as types should all be cleared on package install!
-                    ActionsResolver.Reset();
+                    ActionsResolver.Reset(false); // and do NOT reset the whole resolution!
                     ActionHandlers.Clear();
 
                     //TODO: Based on the above, this is a big hack as types should all be cleared on package install!