Fix policy server signature merging again#19797

tulir wants to merge 5 commits into

element-hq:developelement-hq/synapse:developfrom

tulir:fix-policy-server-signatures-againtulir/synapse:fix-policy-server-signatures-againCopy head branch name to clipboard