Merge "jjb: xci: xci-start-new-vm: Create scenario overrides file"