Merge "Allow kwargs in _get_server_port_id_and_ip4"