On '1.7.x-issue4263' branch: Merge r1421011 from trunk.

Resolved a minor conflict with some tests have Skip markers for ra_serf.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x-issue4263@1423593 13f79535-47bb-0310-9956-ffa450edef68
1 file changed