Merge remote-tracking branch 'origin/develop' into 3218-official-prom

.gitignore

Dockerfile

docs/privacy_policy_templates/README.md

docs/privacy_policy_templates/en/1.0.html

docs/privacy_policy_templates/en/success.html

synapse/api/errors.py

synapse/api/urls.py

synapse/app/homeserver.py

synapse/config/__init__.py

synapse/config/consent_config.py

synapse/config/homeserver.py

synapse/config/key.py

synapse/config/server_notices_config.py

synapse/handlers/__init__.py

synapse/handlers/events.py

synapse/handlers/federation.py

synapse/handlers/message.py

synapse/handlers/presence.py

synapse/handlers/register.py

synapse/handlers/room.py