fix for TOOLS-2664
fix for TOOLS-2665
Merge branch 'master' of https://github.com/wso2-dev/developer-studio into developer-studio-3.7.1