Clear from data container doesn't remove expired entries

ISPN-8548 changed it so that we don't pull entries into memory at once for a clear. However it also is using the iterator method which doesn't return expired entries. We should also return and subsequently remove expired entries.