Applying patch from sohani to fix TOOLS-2545
Merge branch 'developer-studio-3.7.0' of https://github.com/wso2-dev/developer-studio into developer-studio-3.7.0