Stop depending on `room_id` to be returned for children state in the hierarchy response.#12991

clokep merged 2 commits intodevelopmatrix-org/synapse:developfrom

clokep/hierarchy-room-idmatrix-org/synapse:clokep/hierarchy-room-idCopy head branch name to clipboard