Merge "Add missing keystone clients"