Merge remote-tracking branch 'origin/6.2.0' into 7.1.0

Conflicts:
	src/Umbraco.Web/Security/WebSecurity.cs

src/umbraco.businesslogic/User.cs

@@ -162,7 +162,7 @@ namespace umbraco.BusinessLogic
             }
             set
             {
-                _user.Language = value;
+                _user.Password = value;
             }
         }