ENG-5741: use HostAndPort