Rebase boxes from master and fix Puppetfile