On the 1.7.x, 1.8.x and 1.9.x branches: Cherry-pick r1692798 and 1692799 from trunk.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.9.x@1692801 13f79535-47bb-0310-9956-ffa450edef68
10 files changed