Fixing TOOLS-1638

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

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

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