Fix ESBJAVA-3178
fix ESBJAVA-3211
patch branch
Merge remote-tracking branch 'upstream/master' into patch
fix ESBJAVA-3230
Merge pull request #87 from malakasilva/patch

Fix ESBJAVA-3230
Merge pull request #88 from isudana/master

fix for ESBJAVA-3246
fix for ESBJAVA-3107