Merge wso2-dev balana changes by Pulasthi to wso2 repo

Merge wso2-dev balana changes by Pulasthi to wso2 repo