On the '1.7.x-r1646250' branch: merge r1646230,1646250,1646253 from trunk.

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