Merge from trunk - HIVE-7786 - add --SORT_BEFORE_DIFF to union all tez .q.out files (Brock reviewed by Szehon)

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