more improvements to autopkg/munki related bits