Revert "Revert "Adding fix for CEP-907 - Handle regression issues caused...

Reverts wso2-dev/product-cep#12