Merge "Improve VMs spawning for OpenStack"