Merge "Add new CertificateType for the RKP VM" into main