Merging with upstream master sax/vagrant-smartos-packager