Merge branch 'develop' into erikj/client_apis_move

changelog.d/3577.misc

changelog.d/3579.misc

changelog.d/3581.misc

changelog.d/3582.misc

changelog.d/3584.misc

synapse/api/auth.py

synapse/events/snapshot.py

synapse/handlers/_base.py

synapse/handlers/federation.py

synapse/handlers/message.py

synapse/handlers/room_member.py

synapse/push/bulk_push_rule_evaluator.py

synapse/replication/http/send_event.py

synapse/state.py

synapse/storage/events.py

synapse/storage/push_rule.py

synapse/storage/roommember.py

tests/replication/slave/storage/test_events.py

tests/test_state.py