XWIKI-17314: Page editing conflict choices don't work if the page edit is made in-place

* Load diff.js
* Reload the editor when the document is saved with merge
* Better handling of failed HTTP requests (always try to unlock and get back to view)