Cherry-pick etcd fix into the 0.4 branch.