Misc clean-up of push rules datastore#12856

clokep merged 4 commits intodevelopmatrix-org/synapse:developfrom

clokep/push-rule-clean-upmatrix-org/synapse:clokep/push-rule-clean-upCopy head branch name to clipboard