Removing dependency on ZookeeperClient
Merge branch 'blur-384-random-port-cleanup'