XWIKI-9105: A few document fields are not taken into account when doing a 3 ways merge
* fix merge