Fix for ESBJAVA-3341
Merge pull request #73 from kishokpriya/feature1

Fix for ESBJAVA-3341