Backport json2sstable range tombstone fix from 2.0