Fixing TOOLS-2054

git-svn-id: https://svn.wso2.org/repos/wso2/trunk/tools@194537 a5903396-d722-0410-b921-86c7d4935375
Applying a patch from GayanK for reverting the fix for TOOLS-2207

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