ENG-4686 fix further regressions in TestRejoinEndToEnd