fix getting EntityReferenceResolver using WebUtilsService to be
compatible with XWiki 4.x
Merge branch 'dev' into unstable-2.0