Python-troveclient 1.0.8 introduced a regression where the usage
of --bypass-url results in an AuthSystemNotFound exception.
Removing some redundant code, which was due to a previous merge
conflict, fixed the issue.
Closes-bug 1416120
Change-Id: I1c949f69ee08447ce88aeefa92c60f361ab54832