Merge branch 'feature-NXP-12342-picture-templates' from multiple repositories

Repositories:
	nuxeo-features

Repositories without this branch:
	nuxeo-elasticsearch