XWIKI-10151: Collapse the extension job log when there is a merge conflict
* Update test.