XWIKI-10151: Collapse the extension job log when there is a merge conflict
XWIKI-9199: Possibility to automatically overwrite pages which have a merge conflict when upgrading using DW