reapply recently reverted changes

git-svn-id: https://svn.apache.org/repos/asf/xmlbeans/trunk@1833259 13f79535-47bb-0310-9956-ffa450edef68
39 files changed