revert heat_keystoneclient & test to 0afed449681314ff34c2c9481becc68fc1dad893

Change-Id: I19412c8eab050f721e45d6270ae596b0cefbd2dc