Merge "Add etcd3 support for s390x"