fixing https://wso2.org/jira/browse/IDENTITY-1050

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@172941 a5903396-d722-0410-b921-86c7d4935375
Merge changes from branch 4.1.0

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@172942 a5903396-d722-0410-b921-86c7d4935375
fixing https://wso2.org/jira/browse/IDENTITY-1050

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@172943 a5903396-d722-0410-b921-86c7d4935375
fixing https://wso2.org/jira/browse/IDENTITY-1050

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