Merge "Do not lockout service users on auth failures" into release/proposed/2019.2.0