Merge "Revert "Skip unstable v6 scenario tests""