Fixing TOOLS-2141, TOOLS-2095 and TOOLS-2096

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