Merging user-mgt.xml commits that were missed during 4.0.0 branch + IS private branch + trunk merging

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