Fixing some regression issues of TOOLS-1592.

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