Fixing TOOLS-2399 and TOOLS-2400
Merge branch 'master' of https://github.com/wso2-dev/developer-studio