Committing fix for REGISTRY-1672. Thanks Pulasthi for the contribution

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@177983 a5903396-d722-0410-b921-86c7d4935375
Fix for CARBON-14196 in Application Server

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