NXP-7866 Improve import in Explorer
Merge branch 'master' of github.com:nuxeo/nuxeo-apidoc-server

Conflicts:
	nuxeo-apidoc-core/src/main/java/org/nuxeo/apidoc/api/QueryHelper.java