Support dynamically defined Vagrant machines
Merge pull request #2811 from stucki/multiple-vagrant-machines

Support dynamically defined Vagrant machines