Merge conflicts when upgrading XWiki from 8.4.6 to 10.5RC1 on MySQL

STEPS TO REPRODUCE

Preconditions: An instance of XWiki 8.4.6 (created with FileSystem attachment store enabled) and an instance of XWiki 10.5RC1 (to which will be migrated) are available.

1. Go to the newer instance (e.g. 10.5RC1) and copy/cut the

   [...]webapps\xwiki

   folder and replace it (first delete the old one) in the same location on the older version

1. Start the instance and follow the Distribution Wizard through the upgrade process

EXPECTED RESULTS

The upgrade process is completed successfully without errors.

ACTUAL RESULTS

On Step 2 - Flavor are encountered some merge conflicts related to the following pages: 

Macros.TreeTranslations

IconsThemesCode.Translations

XWiki.DocumentTreeTranslations

XWiki.TemplateProviderTranslations

SkinsCode.Translations

Index.Translations

PanelsCode.Translations

Panels.Translations

Main.ActivityTranslations

XWiki.WatchListTranslations

AnnotationCode.Translations

FlamingoThemesCode.Translations

Mail.Translations

XWiki.UserDirectoryTranslations

XWiki.XWikiSyntaxTranslations

Main.SolrTranslations

AppWithinMinutes.Translations

Tour.HomepageTour.Translations

WikiManager.CommonTranslations

WikiManager.Translations

The issue was reproduced only on MySQL (5.7) DB.