On 1.8.x-r1644595 branch: merge the patch output fix for issue 4533
and resolve conflicts in libsvn_client/patch.c and patch_tests.py.  


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