Edited for the new layout of the pki directory in version 0.11+
Merge pull request #3171 from DaveQB/patch-1

Edited for the new layout of the pki directory in version 0.11+