Merge pull request #4100 from matrix-org/rav/room_upgrade_avatar

Remember to copy the avatar on room upgrades

changelog.d/4100.feature

@@ -0,0 +1 @@
+Support for replacing rooms with new ones

synapse/handlers/room.py

@@ -265,7 +265,8 @@ class RoomCreationHandler(BaseHandler):
             (EventTypes.Name, ""),
             (EventTypes.Topic, ""),
             (EventTypes.RoomHistoryVisibility, ""),
-            (EventTypes.GuestAccess, "")
+            (EventTypes.GuestAccess, ""),
+            (EventTypes.RoomAvatar, ""),
         )
 
         old_room_state_ids = yield self.store.get_filtered_current_state_ids(