committing chamaths patch for IDENTITY-1168

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

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