Sync up with latest keystoneclient changes

Change-Id: I895534b2d30dec8e38461e07ebf03ea8f466dad9
Merge "Sync up with latest keystoneclient changes"