Fixing WSAS-1571. Patch by KasunG

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@183728 a5903396-d722-0410-b921-86c7d4935375
Fixing WSAS-1571. Patch by KasunG

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@183732 a5903396-d722-0410-b921-86c7d4935375