kafka-1815; ServerShutdownTest fails in trunk; patched by Chris Cope; reviewed by Jun Rao