Code refactoring fixes related to event builder deployment - merging fix done by Sinthuja
Merge branch 'master' of https://github.com/wso2-dev/carbon-event-processing