[r=nataliabidart] Avoid numbered suffix in usernames when OPENID_STRICT_USERNAMES is True
This commit fixes a cornercase in username conflict handling when
strict usernames are enforced. It also includes some refactoring that
makes the username calculation logic clearer depending on the value of
OPENID_STRICT_USERNAMES.