applying the patch by Dinuka for https://wso2.org/jira/browse/IDENTITY-1024

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@171051 a5903396-d722-0410-b921-86c7d4935375
applying the patch by Dinuka for https://wso2.org/jira/browse/IDENTITY-1024

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