Merge wso2-dev/master to wso2:master

Merge all development modifications done to wso2-dev/master to wso2:master