On the 1.7.x branch: Revert r1643189 because it was an obvious mis-merge
(doubly false: wrong revision merged into the wrong branch).

Manually resolve the svn:mergeinfo conflict on the ./subversion folder.

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