Adding fix for REGISTRY-2257
Merge branch 'master' of https://github.com/wso2-dev/carbon-governance