HIVE-9177: Fix child operator references after NonBlockingOpDeDupProc (II) (Szehon via Xuefu)
merged from trunk, r1646994

git-svn-id: https://svn.apache.org/repos/asf/hive/branches/spark@1646995 13f79535-47bb-0310-9956-ffa450edef68
HIVE-8640: Support hints of SMBJoin [Spark Branch] (Szehon via Xuefu)

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