Fixing https://wso2.org/jira/browse/CARBON-14925
Merge branch 'release-4.3.0' of https://github.com/wso2/carbon4-kernel into release-4.3.0