Merge pull request #113 from isudana/master

refactoring inbound endpoint
Fixing ESBJAVA-3280
Merge pull request #114 from iuj/master

Fixing ESBJAVA-3280
fix for ESBJAVA-3282