Fixing ESBJAVA-3327.
Merge pull request #139 from iuj/master

Fixing ESBJAVA-3327.