Revert "Revert "Fix ESBJAVA-3255""

Reverts wso2-dev/wso2-synapse#100