WIP Ticket #1635 Fix unit test problems in Windows

Explicitly close JarFile/ZipFile in all cases.