On the 1.6.x-issue3646 branch: Merge r949307 from trunk.

* src-branch-1.6.x-4
  Mergeinfo update.

* subversion/tests/cmdline/merge_tests.py
* subversion/tests/cmdline/mergeinfo_tests.py
  Clean merge.

* subversion/libsvn_client/merge.c
  (populate_remaining_ranges): Account for conflicts due to WCNG work on
   trunk.


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