Merged latest changes from trunk.

git-svn-id: https://svn.apache.org/repos/asf/abdera/java/branches/axiom-upgrade@1374773 13f79535-47bb-0310-9956-ffa450edef68