XWIKI-10620 : Unable to resolve wikiReference on document conflict

Refactoring to use EntityReference only.