Merge changes I19704971,I20e0537a into pi-dev

* changes:
  tombstoned: make missing O_TMPFILE workaround actually work around.
  tombstoned: don't bail out if we fail to unlink a file that isn't there.