Merge "Make _get_server_port_id_and_ip4() non-private"