XWIKI-15840: Upgrade embedded Maven to 3.6.0 and Resolve 1.3.1
XWIKI-15840: Upgrade embedded Maven to 3.6.0 and Resolve 1.3.1

xwiki/xwiki-platform,xwiki/xwiki-platform,xwiki/xwiki-platform,xwiki/xwiki-platform,xwiki/xwiki-platform