ENG-6037 fix export test regressions in TestRejoinEndToEnd