Merge pull request #1047 from matrix-org/erikj/state_ids

synapse/api/auth.py

synapse/events/__init__.py

synapse/events/snapshot.py

synapse/handlers/_base.py

synapse/handlers/federation.py

synapse/handlers/message.py

synapse/handlers/room_member.py

synapse/handlers/sync.py

synapse/push/action_generator.py

synapse/push/bulk_push_rule_evaluator.py

synapse/push/httppusher.py

synapse/push/mailer.py

synapse/push/presentable_names.py

synapse/push/push_tools.py

synapse/replication/slave/storage/events.py

synapse/state.py

synapse/storage/push_rule.py

synapse/storage/roommember.py

synapse/storage/state.py

synapse/visibility.py