Bump to Vagrant 1.5.4
Merge pull request #3974 from majksner/patch-6

Vagrant 1.5.4