Merge "Skip unstable v6 scenario tests"