Fixing CARBON-14490 by Dushan

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/kernel/trunk@186830 a5903396-d722-0410-b921-86c7d4935375
Fixing REGISTRY-2011 patch by Senaka

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