Merge "etcd: Replace deprecated --debug option"