Don't throw an error in the block manager when a block is cached on the master due to

a locally computed operation

Conflicts:

	core/src/main/scala/spark/storage/BlockManagerMaster.scala