Merge branch 'fix-NXP-12764-cleanup-messages' from multiple repositories

Repositories:
	nuxeo-features

Repositories without this branch:
	nuxeo-elasticsearch