HIVE-7083 : Fix test failures on trunk (Ashutosh Chauhan via Xuefu Zhang)

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