remove extra /opt/puppet directory, and strip out mangling of /opt/omni/* perms