Merge "Next fix host for os-ha-contrail-X"