Merge "Turn PasswordReset into a service" into REL1_34