Merge changes by https://github.com/wso2-dev/carbon-platform-integration/pull/7

https://github.com/wso2-dev/carbon-platform-integration/pull/7