Merge "Remove deprecated function User::isPasswordReminderThrottled()"