Fixing ESBJAVA-3327.
ESBJAVA-3312
Merge pull request #140 from vanjikumaran/master

ESBJAVA-3312