Rename the pkinit_identity and pkinit_identities parameters to less similar names.  Fall back to 
their old names for compatibility.