Merge "Apply a naming rule of GET to v2 keystone clients"