Merge "Dumpstate: Add tombstone filtering" into oc-mr1-dev