Final changes related to PKI 

Also, typos in secret bag attributes were causing the service password problems on fresh boots...