Merge "Revert "Update nested-virt testing for the 2023.1 cycle""