Update expected test test results on another issue #2282 or tree conflict test.

* subversion/tests/cmdline/merge_tree_conflict_tests.py
  (tree_conflicts_on_merge_local_ci_5_1): Update revisions to match output and
    the status to what the comment in this function says it should be:
      no deletes, just conflicts!

* subversion/tests/cmdline/svntest/deeptrees.py
  (deep_trees_run_tests_scheme_for_merge): Pass --allow-mixed-revisions, as
    these tests are about tree conflicts, not detecting mixed revision
    problems.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1443290 13f79535-47bb-0310-9956-ffa450edef68