This reverts commit e5f5840c27. Devstack has removed zk support from itself in favor of etcd3. We must manage our own zk destiny. Change-Id: Ie68d7da0c0e075826fdba77ba59e05bddb932d7b
e5f5840c27