Merge branch 'master' into graphx

bagel/src/test/scala/org/apache/spark/bagel/BagelSuite.scala

bin/pyspark

conf/log4j.properties.template

core/pom.xml

...main/resources/org/apache/spark/log4j-defaults.properties

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

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

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

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

core/src/main/scala/org/apache/spark/Logging.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/SparkContext.scala

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

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

.../main/scala/org/apache/spark/api/java/JavaDoubleRDD.scala

...rc/main/scala/org/apache/spark/api/java/JavaPairRDD.scala

core/src/main/scala/org/apache/spark/api/java/JavaRDD.scala

...rc/main/scala/org/apache/spark/api/java/JavaRDDLike.scala

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