Applyng fix for REGISTRY-2084
Merge branch 'master' of https://github.com/wso2/carbon-governance