Merge remote-tracking branch 'apache/master' into state-cleanup

Conflicts:
	core/src/main/scala/org/apache/spark/scheduler/DAGScheduler.scala
	core/src/main/scala/org/apache/spark/util/JsonProtocol.scala
Merge branch 'state-cleanup' of github.com:tdas/spark into cleanup