Merge branch 'NXP-6060' from multiple repositories

Repositories:
	nuxeo-features

Repositories without this branch:
	nuxeo-elasticsearch