Merge changes I70c174c4,Ifc365e3b

* changes:
  Correctly implement a stub for ICowWriter::AddXorBlocks
  Add MockSnapshotWriter