HIVE-8602: Add SORT_QUERY_RESULTS for skewjoinopt2 (Rui via Xuefu) merged from trunk r1634262

git-svn-id: https://svn.apache.org/repos/asf/hive/branches/spark@1634441 13f79535-47bb-0310-9956-ffa450edef68
HIVE-8601: Fix auto_sortmerge_join_16 determinism (Szehon via Xuefu) mereged from trunk r1634442

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