Merge "Add heat x509 metadata"