Merge pull request #62 from iuj/master

Fixing ESBJAVA-3010.
Fixing ESBJAVA-3183.
Merge remote-tracking branch 'upstream/master'