Merge "Fix host for os-ha-contrail-40"