Merge r1515225 from trunk:

 * r1515225
   ra_serf: Stringify SVN_AUTH_SSL_OTHER as well
   Justification:
     Avoid discarding information when stringifying an error number into a
     message.
   Depends: r1514785
   Votes:
     +1: danielsh, ivan, breser


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

 * r1515366
   Spurious error for info on working copy root with child in conflict.
   Justification:
     Error is confusing for users, difficult for people using the API.
   Votes:
     +1: philip, breser, stefan2


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

 * r1499044, r1515343, r1515721
   Spell revision numbers as "r%ld" in error messages.
   Justification:
     We should be using 'r%ld' or 'revision %ld' consistently in user output.
   Votes:
     +1: breser, ivan, stefan2
     +1 (without r1515721): danielsh


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

 * r1507889, r1507891
   davautocheck: use the correct apxs binary by default.
   Justification:
     Convenience aside, without this patch, davautocheck would use the wrong
     apxs binary when invoked "by hand" (not via make).
   Votes:
     +1: danielsh, breser, stefan2


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