Revert "Revert "Adding fix for CEP-907 - Handle regression issues caused by fix ..."
Merge pull request #14 from wso2-dev/revert-12-revert-10-CARBON-14867

Adding back fix for CEP-907 - Handle regression issues caused...