Merge "CertPathSpi: fix encoding arg name"