TEZ-322. Fix Tez after YARN-918 (bikas)