Applying fix for REGISTRY-2102
Merge branch 'master' of https://github.com/wso2/carbon-registry