Merge latest trunk into branch (Thejas Nair)

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