HIVE-8780: insert1.q and ppd_join4.q hangs with hadoop-1 [Spark Branch] (Chengxiang via Xuefu)

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