Initialise UserPresenceCache instances to always contain a 'presence' key
Don't add a 'prev' key to m.room.member messages
Fix tests from prev commit
Merge branch 'develop' of github.com:matrix-org/synapse into upgrade_script