Bump akka and blockmanager timeouts to 60 seconds (branch 0.7 backport)

This is now identical to what was committed to master.