Bug 335019. When importing certs from PKCS12 files, and the cert and the private key both have different nicknames, import the cert with the nickname from the file's cert, not from the file's private key. Also, fix an infinite loop and certain other bugs.  r=neil.williams.
Bug 335019. When importing certs from PKCS12 files, and the cert and the
private key both have different nicknames, import the cert with the
nickname from the file's cert, not from the file's private key.
Also, fix an infinite loop and certain other bugs.  r=neil.williams.

thespooler/nss,thespooler/nss,thespooler/nss,thespooler/nss,thespooler/nss,thespooler/nss,thespooler/nss