Pull request to sych up with wso2-dev

Changes by Malaka and Chanaka are included in this pull request