Merging needs to update Conversation.message.user_id

[spinosa]

We are correctly updating roll ownership on all Frames during merge.

But Conversations with Messages that reference the old User (via message.user_id) are not updated. This isn't terrible but it's not correct and would ideally update correctly for old data.