Fixing TOOLS-1470

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

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