NXP-12487 cleanup + move Nuxeo specific handling class