Merge "Use IDTYPE_ASN1DN when using certificates."