A series of changes to get the vagrant build lab working again.

The vagrant build lab that has been with omnibus-chef-server
had bit rotted and it was impossible to just do a vagrant up
and have it work. These changes make that possible again.
Merge branch 'mm/fix-vagrant-buildlab'