Don't retry infinitely when in a loop
Bug 915255 - Correctly regenerate token when use_authorization_tokens is true

We should not use password auth until we've had a 401 from token auth or no token is provided or wanted.
Merge pull request #323 from smarterclayton/bug_915255_recreate_token

Merged by openshift-bot