Adding Manjula's fix for APIMANAGER-1384

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@177687 a5903396-d722-0410-b921-86c7d4935375
Added fix for APIMANAGER-1369

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