Merge branch 'NXP-4186-and-NXP-4187' from multiple repositories

Repositories:
	nuxeo-features

Repositories without this branch:
	nuxeo-elasticsearch