Merge "Fix ResetPasswordWithTokenTest test" into sc-v2-dev