ESBJAVA-3305
Merge pull request #128 from vanjikumaran/master

ESBJAVA-3305