HIVE-8348: Fix Hive to match changes introduced by TEZ-1510 (Gopal V via Gunther Hagleitner)

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