Merge branch 'develop' into neilj/room_capabilities

synapse/handlers/search.py

synapse/http/federation/matrix_federation_agent.py

synapse/http/matrixfederationclient.py

synapse/replication/http/federation.py

synapse/replication/http/send_event.py

synapse/rest/client/v1/room.py

synapse/rest/consent/consent_resource.py

synapse/server.py

synapse/state/__init__.py

synapse/state/v1.py

synapse/state/v2.py

synapse/storage/_base.py

synapse/storage/background_updates.py

synapse/storage/engines/sqlite.py

synapse/storage/event_federation.py

synapse/storage/events.py

synapse/storage/events_worker.py

synapse/storage/monthly_active_users.py

synapse/storage/roommember.py

synapse/storage/schema/delta/53/event_format_version.sql