Applying a patch from AsankaS for fixing TOOLS-1846

git-svn-id: https://svn.wso2.org/repos/wso2/trunk/tools@184752 a5903396-d722-0410-b921-86c7d4935375
Applying a patch from Susinda for fixing TOOLS-1906

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