Merge pull request #1835 from qnet-herwin/retry_winbind_auth_with_normalized_username