Fix whitespace before package declaration for new files.
ISPN-4643 Make sure EntryIterator doesn't return expired entries