Applying a patch from Gayan for fixing TOOLS-2008

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

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