NXP-12594 make nuxeo service mockable
NXP-12594 cleanup
NXP-12594 cleanup