Add export conflict resolution steps for pingfederate_certificates_revocation_ocsp_certificate and pingfederate_server_settings_ws_trust_sts_settings_issuer_certificate#74