On the '1.7.x-issue4270' branch: merge r1427197 from trunk.

Resolved a trivial conflict on deleting a line which had changed on trunk.


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