NXP-11044: follow changes on other funkload tests
NXP-11044 + NXP-11138: follow changes on funkload tests
Merge branch 'feature-NXROADMAP-127-DAM2' of github.com:nuxeo/nuxeo-distribution into feature-NXROADMAP-127-DAM2