FIx for ESBJAVA-2697
Merge pull request #146 from vanjikumaran/master

FIx for ESBJAVA-2697