Merge branch '5.4.1-I20110302_0116' from multiple repositories

Repositories:
	nuxeo-features

Repositories without this branch:
	nuxeo-elasticsearch