Adding Tanya's patch for CARBON-14122.

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/kernel/trunk@174306 a5903396-d722-0410-b921-86c7d4935375
Adding Tanya's patch for CARBON-14123.

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