Merge "Making Keystone clients consistent"