Fixed TOOLS-2241

git-svn-id: https://svn.wso2.org/repos/wso2/trunk/tools@193875 a5903396-d722-0410-b921-86c7d4935375
Applying patch from lali to fix TOOLS-2206

git-svn-id: https://svn.wso2.org/repos/wso2/trunk/tools@193876 a5903396-d722-0410-b921-86c7d4935375