Fix end of stream detection during rejoin bug introduced by the previous
refactoring.
Fix end of stream detection during join bug introduced by the previous
refactoring.
Simplify TestRejoinEndToEnd because IV2 is always on now.