
Update and correct issues with shade to support use of request_mock instead of keystoneclient. This solves issues with the catalog v2, the discovery.json, and leans on the fixes for the test_create_user_v2. Change-Id: I78666d44d0a2ff9f013a68c09c76d092fea3a586