Merging wso2-dev repo with wso2/carbon-commons