HIVE-7825: Bring tez-branch up-to the API changes made by TEZ-1472, TEZ-1469 (Siddharth Seth via Gopal V)

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