Merge "Switch scenario jobs to nested-virt nodes"