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