Merge branch '5.4.2-I20110404_0115' from multiple repositories

Repositories:
	nuxeo-features

Repositories without this branch:
	nuxeo-elasticsearch