Using configured akka timeouts
Merge branch 'master' of https://github.com/alig/spark

Conflicts:
	core/src/main/scala/org/apache/spark/deploy/master/Master.scala