librpc/idl: Merge missing bits into nbt_server_type in nbt.idl