test case for ESBJAVA-3471
conflict fix
Merge pull request #128 from malakasilva/master

test case for ESBJAVA-3471