Set correct perms for a couple of puppet directories
Merge branch 'perms_fixes' into working_version

* perms_fixes:
  Set correct perms for a couple of puppet directories