On 1.9.x-r1664664: merge r1664664, r1664672 and r1664674, resolve
text conflict in ra-test.c for r1664664.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.9.x-r1664664@1674267 13f79535-47bb-0310-9956-ffa450edef68
3 files changed