Merge remote-tracking branch 'origin/develop' into erikj/type_server

changelog.d/8040.misc

changelog.d/8050.misc

changelog.d/8051.misc

changelog.d/8052.feature

changelog.d/8058.misc

docker/conf/log.config

docs/sample_config.yaml

docs/sample_log_config.yaml

synapse/config/_util.py

synapse/config/logger.py

synapse/config/saml2_config.py

synapse/handlers/events.py

synapse/handlers/saml_handler.py

synapse/http/client.py

synapse/http/federation/matrix_federation_agent.py

synapse/http/matrixfederationclient.py

synapse/notifier.py

synapse/res/templates/saml_error.html

tox.ini