HIVE-7907: Bring up tez branch to changes in TEZ-1038, TEZ-1500 (Gopal V via Gunther Hagleitner)

git-svn-id: https://svn.apache.org/repos/asf/hive/branches/tez@1622366 13f79535-47bb-0310-9956-ffa450edef68