Committing the fix for https://wso2.org/jira/browse/CEP-851
Merge pull request #1 from mohanvive/master

Committing the fix for https://wso2.org/jira/browse/CEP-851