Fixing CARBON-14481 by IsuruP

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/kernel/trunk@186769 a5903396-d722-0410-b921-86c7d4935375
Fixing REGISTRY-1881, REGISTRY-1889

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