Merge "Add keystone service metadata for v3 client"