Fixing ESBJAVA-3010.
Merge pull request #62 from iuj/master

Fixing ESBJAVA-3010.