rename thrift blocking server/client
testdrive zookeeper watcher