Merge remote-tracking branch 'upstream/master' into feat-dockerfile

synapse/replication/http/send_event.py

synapse/rest/client/v1/logout.py

synapse/rest/client/v1/register.py

synapse/rest/client/v1/room.py

synapse/rest/client/v2_alpha/register.py

synapse/rest/media/v1/media_storage.py

synapse/storage/__init__.py

synapse/storage/_base.py

synapse/storage/engines/__init__.py

synapse/storage/event_federation.py

synapse/storage/events.py

synapse/storage/events_worker.py

synapse/storage/room.py

synapse/storage/search.py

synapse/types.py

synapse/util/caches/response_cache.py

synapse/util/file_consumer.py

synapse/util/logcontext.py

tests/config/test_load.py

tests/crypto/test_keyring.py