XWIKI-9813: Merge conflict when creating a subwiki and adding some members.

(cherry picked from commit aceb745addabe3a36d6e83149ccaad9d599504b4)