Revert "Revert "Fix ESBJAVA-3211""
Merge pull request #117 from wso2-dev/revert-116-revert-99-master

"Fix ESBJAVA-3211"