Changes to support vagrant-berkshelf 4.0, which is what is currently being
installed by default.