backport e2e setup to 7.10.1
Plain backport of the e2e current (7.10.2) setup to the last version. This should help running the tests in this environment.
Plain backport of the e2e current (7.10.2) setup to the last version. This should help running the tests in this environment.