TEZ-1861. Fix failing test: TestOnFileSortedOutput. (sseth)
(cherry picked from commit e8d7dc9dc1463d5bb0e36144b0e9d0f9bab599ac)

Conflicts:
	CHANGES.txt