revert keystone client changes to cd853f699496fc7d7e98d4c5cbe7deda8eb5a360

Change-Id: I1082c7ea08124ae8b6036b9aed8db82a87da7604