Vagrant: Give Virtualbox VMs a name (Feature #2496)
Fix Vagrant 1.2.x warnings (Feature #3241)
Merge branch 'issue_2496'