Merge branch 'develop' into application-services-txn-reliability

CHANGES.rst

README.rst

UPGRADE.rst

synapse/__init__.py

synapse/app/homeserver.py

synapse/config/server.py

synapse/config/tls.py

synapse/crypto/context_factory.py

synapse/crypto/keyring.py

synapse/federation/federation_client.py

synapse/federation/federation_server.py

synapse/handlers/events.py

synapse/handlers/profile.py

synapse/http/server.py

synapse/push/__init__.py

synapse/push/baserules.py

synapse/push/httppusher.py

synapse/rest/client/v1/push_rule.py

synapse/storage/push_rule.py

synapse/storage/schema/delta/14/v14.sql