Merge branch 'fix-NXP-12685-BIRT-and-diff' from multiple repositories

Repositories:
	nuxeo

Repositories without this branch:
	nuxeo-services
Merge branch 'fix-NXP-12685-BIRT-and-diff' from multiple repositories

Repositories:
	nuxeo

Repositories without this branch:
	nuxeo-theme
Merge branch 'fix-NXP-12685-BIRT-and-diff' from multiple repositories

Repositories:
	nuxeo

Repositories without this branch:
	nuxeo-webengine