Provide old-locking mode for broken JDKs that synch on everything NIO-related
Fix up bad merge