merging the branch 4.0.7 to trunk

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

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