Cherry-pick merge r458643 from branches/cache-server to /trunk
(this accidentally didn't get included into the r1476664 merge).

Not intended for 1.8 back-port.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1477540 13f79535-47bb-0310-9956-ffa450edef68