Removed files CoreTestConfig and StreamingTestConfig
Merge branch 'master' into velvia-SPARK-544

Conflicts:
	core/src/main/scala/org/apache/spark/SparkContext.scala
	core/src/main/scala/org/apache/spark/storage/BlockManager.scala