Merge branch 'develop' of github.com:matrix-org/synapse into erikj/xpath_fix

MANIFEST.in

jenkins-dendron-postgres.sh

jenkins-postgres.sh

jenkins-sqlite.sh

jenkins/clone.sh

jenkins/prepare_synapse.sh

scripts-dev/federation_client.py

scripts/synapse_port_db

synapse/federation/federation_client.py

synapse/federation/federation_server.py

synapse/federation/transport/client.py

synapse/federation/transport/server.py

synapse/handlers/device.py

synapse/handlers/e2e_keys.py

synapse/rest/client/v2_alpha/keys.py

synapse/server.py

synapse/server.pyi

synapse/storage/end_to_end_keys.py

synapse/storage/events.py

synapse/storage/schema/delta/33/devices_for_e2e_keys.sql