merging to trunk

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

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