ZK cluster id can now be passed to master/agent with --zk-cluster-id