Merge the r1477294 group from trunk:

 * r1477294, r1480616, r1480641, r1480642, r1480664, r1480669
   Further improvements for interactive resolution of property conflicts.
   Allow conflicted properties to be edited and resolved to the edited value.
   Justification:
     This is a usability enhancement we could make in 1.8.0.
     It also fixes a bug in libsvn_wc where it doesn't use results provided
     by the conflict callback (see r1480641), which might help API consumers.
   Notes:
     This group depends on r1470246.
     r1477294 and r1480616 are merged to avoid text conflicts from refactoring.
     r1480641 and r1480642 are the main changes.
     The other revisions are small follow-up fixes.
   Votes:
     +1: stsp (for 1.8.0, but not any 1.8.x since it changes the UI)
     +1: steveking
     +1: julianfoad
     -0: rhuijben (requires backport branch. I get a merge conflict using 1.7
                   <stsp> This is because this group requires r1470246 to
                          be merged first, as noted under Notes:)



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