On the revprop-caching-ng branch:  Sync with /trunk up to r1632943.

Resolved various text conflicts caused by r1632926 on /trunk, but
they all effectively resolved to "use mine".

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/revprop-caching-ng@1632945 13f79535-47bb-0310-9956-ffa450edef68