Fix for ESBJAVA-3345
Changes made after regression test
Merge pull request #50 from kishokpriya/feature1

Fix for ESBJAVA-3345