Flatten submodules
Update build-ova-guest.sh