Revert "Revert "Fix ESBJAVA-3255""
Merge pull request #101 from wso2-dev/revert-100-revert-97-patch

Revert "Revert "Fix ESBJAVA-3255""