Merge "fix etcd startup arguments"