fix for ESBJAVA-3172
fix for ESBJAVA-3172 tests
fix for ESBJAVA-3172 tests
Merge pull request #51 from malakasilva/master

Fix for ESBJAVA-3172