Add a latest fix done from branch

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/kernel/trunk@174095 a5903396-d722-0410-b921-86c7d4935375
Add a temporary fix with user-mgt modifications for Errors in tests

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