taking changes from kernel4.1.0 patch0002

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/kernel/trunk@179456 a5903396-d722-0410-b921-86c7d4935375
fixing CARBON-14257. Thanks Manoj for your contribution

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