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

(cherry picked from commit 6aec000c93e5f616b5badb9907ad3857157752d0)