[misc] Backported the workflow to 3.1.1: recopied the merge module from 3.2.1 and recoded the XWikiDocument#merge function which didn't exist on 3.1.1. the merge function is used to do a controlled 3 way merge on the publication of a document.