Commiting the patch from Lasantha for TOOLS-1567. Thanks for the contribution

git-svn-id: https://svn.wso2.org/repos/wso2/trunk/tools@166432 a5903396-d722-0410-b921-86c7d4935375
Commiting the patch from Lasantha for TOOLS-1568. Thanks for the contribution

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