XCOMMONS-484: Silent conflict merge when diff between previous/next is not at the exact same indices than in previous/current diff

(cherry picked from commit e352487ed09a35cd028ef37fb0b04af723309821)