Merge branch 'develop' of github.com:matrix-org/synapse into neilj/disable_hs

MANIFEST.in

README.rst

changelog.d/3585.bugfix

changelog.d/3644.misc

changelog.d/3658.bugfix

contrib/docker/README.md

contrib/grafana/synapse.json

docker/Dockerfile

docker/README.md

docker/conf/homeserver.yaml

docker/conf/log.config

docker/start.py

synapse/handlers/profile.py

synapse/storage/events.py

synapse/storage/monthly_active_users.py

synapse/storage/schema/delta/51/monthly_active_users.sql