MULE-7468 Resolve compilation errors due to refactoring
Merge pull request #978 from mulesoft/MULE-7468

MULE-7468 Resolve compilation errors due to refactoring