[MERGE] OPW 576744: res_users: backport of 6.1 fix to avoid blocking logins when...