Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs

jenkins-postgres.sh

jenkins-sqlite.sh

jenkins.sh

scripts/synapse_port_db

synapse/app/homeserver.py

synapse/app/pusher.py

synapse/config/jwt.py

synapse/config/server.py

synapse/handlers/room_member.py

synapse/http/client.py

synapse/http/server.py

synapse/http/site.py

synapse/push/httppusher.py

synapse/push/pusherpool.py

synapse/python_dependencies.py

synapse/replication/pusher_resource.py

synapse/replication/resource.py

synapse/replication/slave/storage/events.py

synapse/replication/slave/storage/pushers.py

synapse/replication/slave/storage/receipts.py