Fix for ESBJAVA-3275 by jsdjayanga
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge pull request #175 from jeewamp/master

Fix for ESBJAVA-3275 by jsdjayanga