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

https://issues.jboss.org/browse/ISPN-4643
These changes have left behind quite a big number of unused imports.