Merge "Fix for patch with etcd in k8s_ha_contrail."