Applying fix for REGISTRY-2091
Merge branch 'master' of https://github.com/wso2/product-greg