Merge "tombstoned: log where we're writing the tombstone." into oc-dev