Merge r1577151, resolving minor conflicts in test suite.

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