HIVE-9048: Hive build failed on hadoop-1 after HIVE-8828 (Chengxiang via Xuefu)

git-svn-id: https://svn.apache.org/repos/asf/hive/branches/spark@1644172 13f79535-47bb-0310-9956-ffa450edef68
HIVE-9054 - Add additional logging to SetSparkReducerParallelism [Spark Branch] (Brock reviewed by Jimmy Xiang)

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