Merge pull request #96 from isudana/master

fix for ESBJAVA-3258
fix for ESBJAVA-3260