missed merge to trunk by ravi. Branch commit r176788

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@178083 a5903396-d722-0410-b921-86c7d4935375
missed merge to trunk by ravi. Branch commit 175974

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@178084 a5903396-d722-0410-b921-86c7d4935375
missed merge to trunk by ravi. Branch commit 174076

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