ZooKeeper ensembles, some fixes building on #1114