Merge branch 'master' into develop

CHANGES.md

changelog.d/7696.doc

contrib/docker/docker-compose.yml

debian/changelog

synapse/app/homeserver.py

synapse/handlers/auth.py

synapse/handlers/federation.py

synapse/handlers/oidc_handler.py

synapse/http/server.py

synapse/rest/client/v1/pusher.py

synapse/rest/client/v2_alpha/account.py

synapse/rest/client/v2_alpha/account_validity.py

synapse/rest/client/v2_alpha/auth.py

synapse/rest/client/v2_alpha/register.py

synapse/rest/consent/consent_resource.py