Merge branch 'develop' into rav/guest_access_after_room_join

synapse/api/constants.py

synapse/handlers/_base.py

synapse/handlers/directory.py

synapse/handlers/events.py

synapse/handlers/federation.py

synapse/handlers/message.py

synapse/handlers/presence.py

synapse/handlers/profile.py

synapse/handlers/room.py

synapse/handlers/sync.py

synapse/push/__init__.py

synapse/push/action_generator.py

synapse/push/bulk_push_rule_evaluator.py

synapse/push/httppusher.py

synapse/push/push_rule_evaluator.py

synapse/push/pusherpool.py

synapse/rest/client/v1/presence.py

synapse/rest/client/v1/push_rule.py

synapse/rest/client/v1/pusher.py

synapse/rest/client/v1/room.py