HIVE-8967: Fix bucketmapjoin7.q determinism (Jimmy via Xuefu)
merged from trunk, r1641875

git-svn-id: https://svn.apache.org/repos/asf/hive/branches/spark@1641877 13f79535-47bb-0310-9956-ffa450edef68
Merge HIVE-8971 - HIVE-8965 exposed some classes which start with Test but are not tests (Brock reviewed by Xuefu)

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