Merge branch 'netcore/dev' into netcore/7668-remove-repository-concerns-from-services

# Conflicts:
#	src/Umbraco.Infrastructure/Composing/CompositionExtensions/Repositories.cs

src/Umbraco.Infrastructure/Persistence/Repositories/Implement/UserRepository.cs

@@ -543,6 +543,16 @@ ORDER BY colName";
                 }
             }
 
+            // If userlogin or the email has changed then need to reset security stamp
+            if (changedCols.Contains("userLogin") || changedCols.Contains("userEmail"))
+            {
+                userDto.EmailConfirmedDate = null;
+                userDto.SecurityStampToken = entity.SecurityStamp = Guid.NewGuid().ToString();
+                
+                changedCols.Add("emailConfirmedDate");
+                changedCols.Add("securityStampToken");  
+            }
+
             //only update the changed cols
             if (changedCols.Count > 0)
             {