XWIKI-9105: A few document fields are not taken into account when doing a 3 ways merge
(cherry picked from commit 0207c53385685c4d8e250e948e9c4f6e5db06456)