HIVE-9157 - Merge from trunk to spark 12/26/2014 [Spark Branch] (Post Merge Fixes)

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