Fix for CARBON-15021
Merge branch 'master' of https://github.com/vanjikumaran/wso2-axis2 into vanjikumaran-master
Merge branch 'vanjikumaran-master' into release-1.6.1-wso2v11