Fix ESBJAVA-3284 - Patch provided by Ravi
Merge pull request #125 from malakasilva/master

Fix ESBJAVA-3284