On the 1.8.x-r1477876 branch: merge r1477876 from trunk, resolving conflicts.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x-r1477876@1478010 13f79535-47bb-0310-9956-ffa450edef68
On the 1.8.x-r1477876 branch: merge r1477891,1478001 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x-r1477876@1478011 13f79535-47bb-0310-9956-ffa450edef68
On the 1.8.x-r1477876 branch: merge r1479605 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x-r1477876@1481992 13f79535-47bb-0310-9956-ffa450edef68
On the 1.8.x-r1477876 branch: catch up to 1.8.x@1482006.

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

 * r1479540
   Add an in typemap for PROPHASH to the Perl bindings.
   Justification:
     Make it easier to use APIs that take hashes of properties as input.
   Votes:
     +1: breser, rschupp


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

 * r1479563, r1480119, r1487083
   Make svn_client_log5() callable from the Perl bindings.
   Justification:
     1.6 API that wasn't wrapped yet.
   Votes:
     +1: breser, rschupp


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

 * r1477876, r1477891, r1478001, r1479605
   Fix a bug whereby a property conflict description always reported
     'unknown' for the node kind. Add a test which catches that bug.
   Justification:
     Regression from 1.7.
   Branch: ^/subversion/branches/1.8.x-r1477876
   Notes:
     The fix is in r1477876, and the branch was needed to resolve conflicts
     (rather than porting prior changes on which it depended). The test is
     in r1478001, and it depends on the test file changes made in r1477891.
     r1479605 fixes an interactive conflict resolution bug triggered by this
     change.
   Votes:
     +1: julianfoad, stsp, cmpilato


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

 * r1485127
   Revert 1.8 behavior change that breaks some url forms when passed to
   ra_local. Without this some existing working copies using non standard
   urls to access the repository might be broken.
   Justification:
     Restores functionality that was lost in 1.8 compared to 1.7.
   Votes:
     +1: rhuijben (for 1.8.1 or soak restart), danielsh, cmpilato


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