Fix ESBJAVA-3171
Fix ESBJAVA-3171
Fixes related to ESBJAVA-3171 from MalakaS, merge branch 'master' of https://github.com/malakasilva/carbon4-kernel into malakasilva-master
Fixes related to ESBJAVA-3171 from MalakaS, merging branch 'malakasilva-master'