merging after

Merge branch 'developer-studio-3.7.0' of https://github.com/wso2-dev/developer-studio into 370
fix TOOLS-2506
merge before tool 2506
Merge branch '370' of https://github.com/lsdeva/developer-studio into 370