Merge "Do not lockout service users on auth failures"