Merge branch 'master' into spark-1002-remove-jars

core/src/main/scala/org/apache/spark/Accumulators.scala

core/src/main/scala/org/apache/spark/MapOutputTracker.scala

core/src/main/scala/org/apache/spark/Partitioner.scala

core/src/main/scala/org/apache/spark/SparkConf.scala

core/src/main/scala/org/apache/spark/SparkContext.scala

core/src/main/scala/org/apache/spark/SparkEnv.scala

...in/scala/org/apache/spark/api/java/JavaSparkContext.scala

...rc/main/scala/org/apache/spark/api/python/PythonRDD.scala

...src/main/scala/org/apache/spark/broadcast/Broadcast.scala

...n/scala/org/apache/spark/broadcast/BroadcastFactory.scala

...main/scala/org/apache/spark/broadcast/HttpBroadcast.scala

...n/scala/org/apache/spark/broadcast/TorrentBroadcast.scala

...in/scala/org/apache/spark/deploy/FaultToleranceTest.scala

...ain/scala/org/apache/spark/deploy/LocalSparkCluster.scala

.../main/scala/org/apache/spark/deploy/SparkHadoopUtil.scala

...rc/main/scala/org/apache/spark/deploy/client/Client.scala

...ain/scala/org/apache/spark/deploy/client/TestClient.scala

...rc/main/scala/org/apache/spark/deploy/master/Master.scala

...cala/org/apache/spark/deploy/master/MasterArguments.scala

...rg/apache/spark/deploy/master/SparkZooKeeperSession.scala