Fixing TOOLS-1704

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

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