Merge -c 1236041 from trunk to branch-0.23 to fix MAPREDUCE-3721. Fixed a race in shuffle which caused reduces to hang.