On the 1.5.x-r36879 branch: Merge r36879 from trunk, resolving some minor
conflicts in merge_tests.py.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x-r36879@876978 13f79535-47bb-0310-9956-ffa450edef68
2 files changed