Bring reintegrate branch up to date with trunk.

   $ svn merge -r28946:28976 https://svn.collab.net/repos/svn/trunk .


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/reintegrate@869051 13f79535-47bb-0310-9956-ffa450edef68
31 files changed