Merge "Add cinder x509 metadata"