Merge pull request #89 from isudana/master

fix for ESBJAVA-3107
fixing L1 ESBJAVA-3148
Merge pull request #90 from miyuru/master

fixing L1 ESBJAVA-3148
fix for ESBJAVA-3249