HIVE-6310: Fix a few minimr test failures (reviewed by Brock)

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