MULE-6843: changes to fix issues with Devkit's integration tests