HIVE-8353 - Merge trunk into spark 10/4/2015 (Fix post merge issues) [Spark Branch]

git-svn-id: https://svn.apache.org/repos/asf/hive/branches/spark@1629564 13f79535-47bb-0310-9956-ffa450edef68
HIVE-8356 - Fix fs_default_name2.q on spark2 [Spark Branch]

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