Fixes to the broken Vagrant provisioning process. More details on the specific

changes are recorded in the commit comments.