Committing the changes to fix the ESBJAVA-3368
Committing the changes to fix the ESBJAVA-3368
Merge pull request #153 from chanakaudaya/master

Adding fixes for ESBJAVA-3368