Merge "Always extract etcd archive"