Merge pull request #86 from isudana/master

fix for ESBJAVA-2987
fix for ESBJAVA-3246