Please review the attached patch which addresses the following ticket:

PKI TRAC Ticket #1370 - pkispawn: installation with HSM from external CA should hold off prepending token name in serverCertNick.conf till phase 2

The code was successfully tested on a machine with an attached HSM.