Adding/Upgrading to JavaLoader 1.1.  Copying over some changes that didn't make it from my merge for locking.