RemoveStageBarrier: fix problem with consolidated shuffle file