Merge "Attempt to fix k8s-ha-contrail"