ISPN-4643 Make sure EntryIterator doesn't return expired entries