Synchronizing WSO2-dev and Wso2 Repo

This pull request is to merge the code in wso2-dev environment to wso2 main environment.