Merge the r1572102 group from trunk:

 * r1572102, r1572200
   Fix a failed wc upgrade from 1.7 with exclusive wc locking.
   Notes:
     1.8 doesn't support running the regression test with exclusive locking
     so the regression test always passes.
   Justification:
     Reported by a user, upgrade is expected to work.
   Votes:
     +1: philip, brane, rhuijben


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

 * r1573088
   Add Mavericks to our sysinfo output.
   Justification:
     It's obvious, keeps us consistent with previous version behavior.
   Votes:
     +1: breser, brane, rhuijben


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