Remove temporary code in ClientManager
Remove temporary code in ClientManager

This effectively reverts https://review.openstack.org/#/c/341618/.

Change-Id: Ic8e53e17b4a5352b0c00e39bcb5d248b057540a9

openstack/python-openstackclient,dtroyer/python-openstackclient,openstack/python-openstackclient,dtroyer/python-openstackclient