Improve generation of vagrant vm
Merge pull request #1146 from nlegoff/vm-improvement

[READY][3.8.6]Improve generation of vagrant vm