WIP - Vagrant fixes for Vagrant.EPS.Marketplace