Fixing IDENTITY-1533 and IDENTITY-1845 by Venura

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