On the 1.7.x-issue4306 branch, merge r1438602 and r1438683, resolving conflicts.


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