On the 1.7.x-issue3814 backport branch, merge the following revisions
from trunk, resolving conflicts:
  r1166267: Merged to prevent conflicts in diff_tests.py.
  r1206576: Tweak 'svn diff' output for prop values not terminated with EOL.
  r1206718: Fix issue #3814.
  r1206719: Follow-up fix for JavaHL tests.


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