Merge r1481594 from trunk:

 * r1481594
   Speed up reporting and authz checks on copy-from info in 'svn log'.
   Justification:
     The way we implemented merges makes replacements and add-with-history
     a much more common occurance than they would otherwise be.  With this
     simple change, I've witnessed a ~25% speedup for e.g. the FreeBSD repo.
   Votes:
     +1: stefan2 (for 1.8.1)
     +1: rhuijben, ivan


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

 * r1482327, r1482338
   Resolve segfault on upgrading from pre 1.7 working copies, where there
   are local property changes or conflicts or changelist, but no tree conflict.
   Justification:
     Regression from 1.7.
   Votes:
     +1: philip, breser, rhuijben


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