merging changes from 420 branch to trunk

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