On the 1.10-cache-improvements branch:
Catch up with /trunk up to and including r1681961.
Resolve a trivial text conflict in cache-membuffer.c .

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.10-cache-improvements@1681963 13f79535-47bb-0310-9956-ffa450edef68