On the cache-server branch:
catch up merge with /trunk up to and including r1476567
No conflicts.

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