Applying a patch from Susinda for fixing TOOLS-1895, TOOLS-1894, TOOLS-1877

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