Merge revisions 19409-19418 from trunk to the nonxml-entries branch.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/nonxml-entries@859493 13f79535-47bb-0310-9956-ffa450edef68