Merge branch 'develop' into rav/refactor_device_query

MANIFEST.in

jenkins-dendron-postgres.sh

jenkins-postgres.sh

jenkins-sqlite.sh

jenkins/clone.sh

jenkins/prepare_synapse.sh

scripts-dev/federation_client.py

synapse/app/federation_reader.py

synapse/federation/federation_server.py

synapse/handlers/federation.py

synapse/handlers/room.py

synapse/handlers/sync.py

synapse/push/emailpusher.py

synapse/push/httppusher.py

synapse/replication/slave/storage/directory.py

synapse/replication/slave/storage/events.py

synapse/replication/slave/storage/keys.py

synapse/replication/slave/storage/room.py

synapse/replication/slave/storage/transactions.py

synapse/rest/client/v2_alpha/register.py