Merged r1598985 to the 1.6 branch for compatibility with future Axiom versions.

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