Applying patch for CARBON-14307

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@179722 a5903396-d722-0410-b921-86c7d4935375
Applying patch for CARBON-14307. Thanks Chanika for the contribution

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