HIVE-5884 - Mini tez cluster does not work after merging latest changes (Vikram Dixit K via Thejas Nair)

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