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

tests/handlers/test_appservice.py

tests/rest/client/v1/test_events.py

tests/storage/test_appservice.py

tests/storage/test_event_federation.py

tests/test_distributor.py

tests/test_dns.py

tests/util/test_file_consumer.py

tests/util/test_linearizer.py

tests/utils.py