Make etcd confiurable for deploy - clean up some comments and a Debug statement.