HIVE-7808: Changes to work against Tez-0.5 RC (Siddharth Seth via Gunther Hagleitner)

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