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

Conflicts:
	src/Umbraco.Core/Models/Membership/IUser.cs
	src/Umbraco.Web/Cache/CacheRefresherEventHandler.cs
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/packages.config
	src/umbraco.businesslogic/packages.config
	src/umbraco.cms/Actions/ActionNew.cs

src/Umbraco.Core/Models/Content.cs

@@ -22,7 +22,7 @@ namespace Umbraco.Core.Models
         private DateTime? _expireDate;
         private int _writer;
         private string _nodeName;//NOTE Once localization is introduced this will be the non-localized Node Name.
-
+        private bool _permissionsChanged;
         /// <summary>
         /// Constructor for creating a Content object
         /// </summary>
@@ -82,6 +82,7 @@ namespace Umbraco.Core.Models
         private static readonly PropertyInfo ExpireDateSelector = ExpressionHelper.GetPropertyInfo<Content, DateTime?>(x => x.ExpireDate);
         private static readonly PropertyInfo WriterSelector = ExpressionHelper.GetPropertyInfo<Content, int>(x => x.WriterId);
         private static readonly PropertyInfo NodeNameSelector = ExpressionHelper.GetPropertyInfo<Content, string>(x => x.NodeName);
+        private static readonly PropertyInfo PermissionsChangedSelector = ExpressionHelper.GetPropertyInfo<Content, bool>(x => x.PermissionsChanged);
 
         /// <summary>
         /// Gets or sets the template used by the Content.
@@ -243,6 +244,22 @@ namespace Umbraco.Core.Models
             }
         }
 
+        /// <summary>
+        /// Used internally to track if permissions have been changed during the saving process for this entity
+        /// </summary>
+        internal bool PermissionsChanged
+        {
+            get { return _permissionsChanged; }
+            set
+            {
+                SetPropertyValueAndDetectChanges(o =>
+                {
+                    _permissionsChanged = value;
+                    return _permissionsChanged;
+                }, _permissionsChanged, PermissionsChangedSelector);
+            }
+        }
+
         /// <summary>
         /// Gets the ContentType used by this content object
         /// </summary>

src/Umbraco.Core/Models/Membership/IUser.cs

@@ -19,7 +19,7 @@ namespace Umbraco.Core.Models.Membership
         
         bool NoConsole { get; set; }
         IUserType UserType { get; }
-        string Permissions { get; set; }        
+        string DefaultPermissions { get; set; }
     }
 
     internal interface IUserProfile : IProfile

src/Umbraco.Core/Models/Membership/User.cs

@@ -91,7 +91,7 @@ namespace Umbraco.Core.Models.Membership
         [DataMember]
         public string Language { get; set; }
         [DataMember]
-        public string Permissions { get; set; }
+        public string DefaultPermissions { get; set; }
 
         [DataMember]
         public bool DefaultToLiveEditing { get; set; }