Fixes for 1.3.0+ vagrant, pulled from 10up/varying-vagrant-vagrants/master