Migration conflicts when upgrading a workspace subwiki from any version < 5.2 to 5.2.1

Steps to reproduce:

• Create a 4.1.4 XEM (I manually imported the 4.1.4-ui-all.xar)
• Install the Workspace Template
• create a subwiki (I called mine sorinello)
• shutdown the wiki and replace the war with the 5.2.1 war
• start the 5.2.1 instance
• the DW kicks in, select "Yes, this is an upgrade" and select previous version as "4.1.4"
• upgrade the Main Wiki
• In the Upgrade phase of the DW, select "Upgrade current wiki only" (This is very important !)
• after migrating the main wiki, go to WorkspaceManager.Install page and install and refresh the page.
• access the subwiki created arleir, DW kicks in, select "Yes, this is an upgrade", select "4.1.4", click on "Repair".
• You will get some merge conflicts. Screenshots of the merge conflicts are attached below. NOTE that the screenshots which contain comparison between Current and New version it means they did not have any Previous option there.