fixes related to room v12 and sytest#19898

FrenchGithubUser wants to merge 2 commits into

element-hq:developelement-hq/synapse:developfrom

famedly:tt/room-v12famedly/synapse-upstreaming:tt/room-v12Copy head branch name to clipboard