HCOLL-77 removal of ClientPort in favour of InetSocketAddress