Merge branch 'develop' into client_v2_sync

contrib/jitsimeetbridge/jitsimeetbridge.py

synapse/api/auth.py

synapse/api/errors.py

synapse/app/homeserver.py

synapse/handlers/events.py

synapse/handlers/message.py

synapse/handlers/presence.py

synapse/handlers/register.py

synapse/http/client.py

synapse/http/server.py

synapse/push/__init__.py

synapse/push/httppusher.py

synapse/push/pusherpool.py

synapse/rest/__init__.py

synapse/rest/client/v1/__init__.py

synapse/rest/client/v1/admin.py

synapse/rest/client/v1/directory.py

synapse/rest/client/v1/events.py

synapse/rest/client/v1/initial_sync.py

synapse/rest/client/v1/presence.py