Merge branch 'develop' into neilj/room_capabilities

synapse/config/consent_config.py

synapse/config/registration.py

synapse/config/server.py

synapse/config/tls.py

synapse/crypto/event_signing.py

synapse/event_auth.py

synapse/events/__init__.py

synapse/events/builder.py

synapse/events/utils.py

synapse/events/validator.py

synapse/federation/federation_base.py

synapse/federation/federation_client.py

synapse/federation/federation_server.py

synapse/federation/transaction_queue.py

synapse/federation/transport/client.py

synapse/federation/transport/server.py

synapse/handlers/federation.py

synapse/handlers/message.py

synapse/handlers/room.py

synapse/handlers/room_member.py