On the 1.7.x-r1568872-neon+serf branch:
  - Merged r1568872 from trunk (no conflicts);
  - Made an equivalent change to the above in ra_neon.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x-r1568872-neon+serf@1568943 13f79535-47bb-0310-9956-ffa450edef68