XWIKI-9577 & XCOMMONS-597

Fix dependencies