fixed ESBJAVA-3006
Fixing ESBJAVA-2923
Merge pull request #14 from jayalalk/master

Fixing ESBJAVA-3006