On the 1.8.x-r1536854 branch:
Merge r1536854 from /trunk and resolve conflict in svnadmin_tests.py

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