Fixes: U4-4172 Change password in users section not working (u7.0.3)

Signed-off-by: Shannon <sdeminick@gmail.com>
Updates version

Signed-off-by: Shannon <sdeminick@gmail.com>
Merge remote-tracking branch 'origin/7.0.4' into 7.1.0

Conflicts:
	build/Build.bat
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs
	src/umbraco.providers/UsersMembershipProvider.cs