XWIKI-10252: Add and/or edit objects in a page

* Update the pull request to 6.2 version