Change to vagrant file mandated by Ash.
Merge branch 'master' into 73036462-claimant2