TEZ-919. Fix shutdown handling for Shuffle. (sseth)