TEZ-969. Fix a bug which could cause the Merger to get stuck when
merging 0 segments, in case of container re-use. (sseth)
TEZ-970. Consolidate Shuffle payload to have a single means of
indicating absence of a partition. (sseth)