Improve support for Vagrant VM definitions
Merge pull request #3070 from stucki/vagrant-vm-list-fix

Improve support for Vagrant VM definitions