Merge "Add keystone x509 metadata"