revert heat_keystoneclient & test to 0afed449681314ff34c2c9481becc68fc1dad893