Merge from trunk to in-memory-cache, perhaps for the last time.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/in-memory-cache@871452 13f79535-47bb-0310-9956-ffa450edef68