HIVE-6947 : More fixes for tests on hadoop-2 (Ashutosh Chauhan via Jason Dere)

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