Merge "Add retry for x509.certificate_managed state"