Merge branch 'fix-NXP-13268-short-annot' from multiple repositories

Repositories:
	nuxeo-features

Repositories without this branch:
	nuxeo-elasticsearch