Merge pull request #3970 from schnuffle/develop-py3

changelog.d/3970.bugfix

scripts-dev/dump_macaroon.py

synapse/api/filtering.py

synapse/app/__init__.py

synapse/app/appservice.py

synapse/app/client_reader.py

synapse/app/event_creator.py

synapse/app/federation_reader.py

synapse/app/federation_sender.py

synapse/app/frontend_proxy.py

synapse/app/homeserver.py

synapse/app/media_repository.py

synapse/app/pusher.py

synapse/app/synchrotron.py

synapse/app/user_dir.py

synapse/config/__main__.py

synapse/handlers/e2e_keys.py

synapse/handlers/profile.py

tests/unittest.py