Hypervisor selection
Improvements in script generation.
Merge branch 'test' into dev