Merge 1343543 changes to branch, related JIRAs AXIS2-5395 , AXIS2-5331

git-svn-id: https://svn.apache.org/repos/asf/axis/axis2/java/core/branches/1_6@1479245 13f79535-47bb-0310-9956-ffa450edef68