Change-Id: I795d543f7ab600427618062d6eaa3231408d6660
Partially-Implements: blueprint vagrant-improvements