NXP-12230 - follow changes on CommandLineExecutorService