Merge "[hybrid] Merge config/scenario/{baremetal,virtual}"