turns out 1 second might not be enough
added the cat.threadPool method to the master/1.0/1.x apis
attempting to diagnos random issues with the client.close() test
restore the clock before leaving the process to die
Merge remote-tracking branch 'upstream/master' into 1.5
version 1.5.3
version 1.5.4