Merging latest spark changes to trunk.
HIVE-9337 Move more hive.spark.* configurations to HiveConf [Spark Branch]
HIVE-9257 Merge from spark to trunk January 2015
HIVE-9352 Merge from spark to trunk (follow-up of HIVE-9257)