Added merge placeholder & address dialogs to Collabora. Also some new merge preferences for target filename and location, and placeholder list UI