Merging fix for MULE-7024 from 3.x branch
Merge pull request #84 from mulesoft/MULE-7024-bighorn

Mule 7024 bighorn