Changes for JIRA issues
Merge remote-tracking branch 'wso2dev_upstream/master'