Minor refactoring on ZK and hadoop-mesos