NXP-15315 fixup tests

Conflicts:
	nuxeo-platform-mimetype-core/src/test/java/org/nuxeo/ecm/platform/mimetype/TestMimetypeRegistryService.java