The attached patch addresses the following TRAC ticket:
This patch was tested on a number of subsystems using both pkispawn and GUI configuration.  Some future cleanup information that was encountered while attempting to add this code was added to https://fedorahosted.org/pki/ticket/228 TRAC Ticket #208 - Dogtag 10: Refactor 'pkispawn' and 'pkideploy'.

Please review.