On the r1660593 branch: Merge r1660508,1660593 without verification changes.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x-r1660593@1660596 13f79535-47bb-0310-9956-ffa450edef68
5 files changed