Patience is a gift and perfection a goal. Fix MULE-7024 adding support f...

Merge to 3.5.0-bighorn branch after accepting