Merge "Bump etcd to 3.3.12"