Merge r1567752 from trunk:

 * r1567752
   Fix, very occasional, spurious FAIL in autoprop_tests.py.
   Justification:
     Spurious FAILs confuse people.
   Votes:
     +1: philip, breser, brane
     +0: rhuijben (The patch is ok, but there is a better version on trunk)


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x@1569177 13f79535-47bb-0310-9956-ffa450edef68
Merge r1568872 from trunk:

 * r1568872
   Justification:
     Fixes an API implementation bug in ra_serf.
   Notes:
     r1568871 added a test case to JavaHL that exposed this bug on trunk,
     but it can't be used to test on 1.8.x. Trunk and branch code are
     identical, however.
   Votes:
     +1: brane, rhuijben, ivan


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x@1569178 13f79535-47bb-0310-9956-ffa450edef68