[tech-debt] Backport e2e tests to at least 6.x branch

Per title this is just to track a follow up for our team to improve tests on 6.x branch as 2.10 has a bit of life left in it. I don't think we need to worry about going back to 2.9 branch since that is closer to EOM/EOL dates than 2.10 is.