upgraded to use newest version of xwiki-tools