Merge the r1483125 group from trunk:

 * r1483125, r1483555, r1483927, r1483947
   Fix issue #4367 'merge to shallow WC, repeat merge to infinite depth WC is
   broken'.
   Justification:
     Edge case merge can result in incorrect WC state which cannot be
     committed.
   Notes:
     r1483125, r1483555, and r1483927 are a test and some subsequent tweaks
     for the issue.  r1483947 is the fix proper. 
   Votes:
     +1: pburba, rhuijben, cmpilato


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

 * r1485650
   Convert svnadmin notifications from UTF8 to native encoding.
   Justification:
     Non-UTF8 locales can see garbled output.
   Votes:
     +1: philip, rhuijben, cmpilato


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

 * r1486072
   Fix expansion of custom keywords with values that contain '='.
   Justification:
     Custom keyword values containing '=' should work.
   Votes:
     +1: stsp, danielsh, cmpilato


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

 * r1481944
   Let Windows compile against BDB 5.0, 5.1, 5.2 and 5.3.
   Justification:
     No reason to prevent this.
   Votes:
     +1: breser (for 1.8.1), pburba, cmpilato


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

 * r1483557
   Match our revision property names exactly instead of by prefix only.
   Justification:
     While the impact of this bug is certainly low, it is still an easy
     to fix problem.
   Votes:
     +1: stefan2 (for 1.8.1), rhuijben, pburba


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