On 'xmllite' branch: Merge changes from trunk.

git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/xmllite@1860149 13f79535-47bb-0310-9956-ffa450edef68