Merge "Fix keystone client v3 metadata for some services"