Merge branch '5.1.3.2-patch-NXP-2157' from multiple repositories

Repositories:
	nuxeo-features

Repositories without this branch:
	nuxeo-elasticsearch