Support MSC1767's `content.body` behaviour; Add base rules from MSC3933#14524

turt2live merged 5 commits intodevelopmatrix-org/synapse:developfrom

travis/extev/msc3933-push-rulesmatrix-org/synapse:travis/extev/msc3933-push-rulesCopy head branch name to clipboard