test
filter out pending acks when folding over delta
merge bug25400 into bug25397
which is rather conflict-ridden; essentially requiring the rewriting
of the crux of the change in bug25400 in the context of new iterator.