Pull request from wso2-dev/wso2-axis2 repo.