Merge from the 4.1.0 branch of r127777

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