Merge "Allow configuration of the number of tombstones." into oc-dr1-dev