(CFACT-44) Various fixes for using cfacter under Puppet.

Various fixes to get cfacter working under Puppet (using the --cfacter switch).