On the 1.8.x branch, merge r1471443 and r1471490 from trunk.

 * r1471443, r1471490
   Fix a bug in the Summary of Conflicts when using interactive conflict
   resolution.  Marking a text conflict as resolved but leaving a prop
   conflict unresolved on the same file, or vice versa, would decrement
   both the text and prop conflict summary stats.
   Justification:
     Regression since 1.7.
   Notes:
     r1471443 is just a removal of unused code, and is included here in
     order to avoid conflicts.  r1471490 is the main change.
   Votes:
     +1: julianfoad, brane, stsp


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