Renames NewPasswordPolicy to UserPasswordPolicy
Fixes to handle plurals of expiration in password reset email.
Fixes password policy to honor a user that is updated when changing password.
Fixes to obfuscate a token for resetting password.