Committing fix for MULE-7566

This pull request is meant to address MULE-7566. The fix proposed in the JIRA has been implemented and all existing tests have been verified to pass with this change.