Merging unmerged commits from 4.0.0 branch and IS-4.1.1 private branch

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