Do auth_url.rstrip('/') only if auth_url is set

auth_url can be None, for example, when we use bypass_url.

Also, add rstrip('/') for bypass_url (and management_url), which
is done when management_url is gotten from service catalog.

Change-Id: I4f59cc405386a15f8a266d279b27f279eacdb7f1
Updated from global requirements

Change-Id: Ibb039ec440a513a49cbcf05daa69ac8785770035
Work around pypy testing issue

A recent release of setuptools appears to have introduced a bug that
causes the pypy gate tests to fail.  This applies a temporary workaround
that should restore pypy testing while the root cause of the problem is
researched.

Change-Id: I66597e40c1d2e57cca1292844d228af85214197d
Partial-Bug: 1290562
Merge "Updated from global requirements"
Merge "Do auth_url.rstrip('/') only if auth_url is set"