Override fix for v12 rooms#458

kegsay merged 2 commits intomainmatrix-org/gomatrixserverlib:mainfrom

kegan/override-fixmatrix-org/gomatrixserverlib:kegan/override-fixCopy head branch name to clipboard