Merge "storageproxyd: discard writes when checkpointing, if necessary"