Merge pull request #31491 from kaleemsiddiqu/pki-config-additional-tests