Make a back-port branch for r1477876, the property conflict node-kind fix.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x-r1477876@1477981 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Update the r1477876 proposal, adding a backport branch and a test.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x-r1477876@1478008 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Update the r1477876 proposal, adding a backport branch and a test.
  (Done by merging such a change from the 1.8.x-r1477876 backport branch,
  because I accidentally committed this update to that branch initially.)

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