1) don't have certs disappear because we have empty tokens. 2) Make sure the NSSToken structure has up-to-date nicknames. git-svn-id: svn://10.0.0.236/trunk@115743 18797224-902f-48f8-a5cc-f745e15eee43