HIVE-5647: Fix failing mapreduce tests on the tez branch (Vikram Dixit K via Gunther Hagleitner)

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