Merge "tombstoned: don't create tombstones for failed dumps." into pi-dev