Merge branch 'develop' into babolivier/message_retention

synapse/rest/admin/groups.py

synapse/rest/admin/rooms.py

synapse/rest/admin/users.py

synapse/rest/client/v1/login.py

synapse/rest/media/v1/preview_url_resource.py

synapse/server.py

synapse/server_notices/consent_server_notices.py

synapse/state/__init__.py

synapse/storage/__init__.py

synapse/storage/_base.py

synapse/storage/data_stores/main/account_data.py

synapse/storage/data_stores/main/deviceinbox.py

synapse/storage/data_stores/main/end_to_end_keys.py

synapse/storage/data_stores/main/events.py

synapse/storage/data_stores/main/events_bg_updates.py

synapse/storage/data_stores/main/filtering.py

synapse/storage/data_stores/main/group_server.py

synapse/storage/data_stores/main/media_repository.py

synapse/storage/data_stores/main/receipts.py

synapse/storage/data_stores/main/registration.py