[READY][3.8.6]Improve generation of vagrant vm