Fix ESBJAVA-3168
Merge pull request #49 from malakasilva/master

Fix ESBJAVA-3168