Fixed imports referencing JUnit 3 and old matcher libraries.
430654 - closing client connections can hang worker threads.

Prettified usage of NonBlockingThread and added Javadocs.