Merge pull request #618 from matrix-org/markjh/pushrule_stream

synapse/handlers/message.py

synapse/handlers/sync.py

synapse/notifier.py

synapse/push/clientformat.py

synapse/replication/resource.py

synapse/rest/client/v1/push_rule.py

synapse/storage/__init__.py

synapse/storage/_base.py

synapse/storage/push_rule.py

synapse/storage/schema/delta/30/push_rule_stream.sql

synapse/storage/util/id_generators.py

synapse/streams/events.py

synapse/types.py

tests/replication/test_resource.py

tests/rest/client/v1/test_rooms.py