TEZ-952. Port MAPREDUCE-5209 and MAPREDUCE-5251. (sseth)
TEZ-958. Increase sleeps in TestContainerReuse to fix flaky tests. (hitesh)