Merge "Fix server id reference in _rebuild_server_and_check()"