Merge trunk revisions from last mergepoint (2915) to HEAD (3000) into
my branch, with the except of revision 2920 (which was also previous
merge).  See the relevant /trunk log messages for details.



git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/issue-842-dev@843075 13f79535-47bb-0310-9956-ffa450edef68