Merge branch '5.4.0' from multiple repositories

Repositories:
	nuxeo-features

Repositories without this branch:
	nuxeo-elasticsearch