add some additional information about resource requirements (#5088)
update vagrant version: usually too old in distributions, get it from
vagrantup
Merge remote-tracking branch 'upstream/master'