#212 Added workaround for shutdown problem
Merge pull request #247 from drexin/wip-212-does-not-shutdown-without-zookeeper-drexin

#212 Added workaround for shutdown problem