Merge "Fixes test_user_update_own_password test cleanup problem (New password cannnot be identical to a previous password)"