Automatic merge from submit-queue

e2e.go --isup should also check the version

Just move the setenv up to include --isup

fixes #18667