HIVE-8993: Make sure Spark + HS2 work [Spark Branch] (Chengxiang via Xuefu)

git-svn-id: https://svn.apache.org/repos/asf/hive/branches/spark@1644550 13f79535-47bb-0310-9956-ffa450edef68
HIVE-8508: UT: fix bucketsort_insert tests - related to SMBMapJoinOperator (Chinna via Xuefu)

git-svn-id: https://svn.apache.org/repos/asf/hive/branches/spark@1644662 13f79535-47bb-0310-9956-ffa450edef68
HIVE-9025 : join38.q (without map join) produces incorrect result when testing w
ith multiple reducers (Ted Xu via Ashutosh Chauhan)
merged from trunk, r1644717

git-svn-id: https://svn.apache.org/repos/asf/hive/branches/spark@1644721 13f79535-47bb-0310-9956-ffa450edef68
HIVE-9043: HiveException: Conflict on row inspector for {table} (Szehon via Xuefu)
merged from trunk, r1644764

git-svn-id: https://svn.apache.org/repos/asf/hive/branches/spark@1644765 13f79535-47bb-0310-9956-ffa450edef68
HIVE-9060: Fix child operator references after NonBlockingOpDeDupProc (Szehon via Xuefu)
merged from trunk, r1644780

git-svn-id: https://svn.apache.org/repos/asf/hive/branches/spark@1644781 13f79535-47bb-0310-9956-ffa450edef68
Merge remote-tracking branch 'upstream/spark' into spark