HIVE-8502 - Merge trunk into spark 10/17/14 (update .q.out files)

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