On 1.7.x-san-cert branch, Merge r1565531 from trunk.

This is essentially a hand merge since this function changed pretty drastically
since 1.7.x on trunk.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x-san-cert@1614994 13f79535-47bb-0310-9956-ffa450edef68
On 1.7.x-san-cert branch, merge r1566503 from trunk.

Again this is hand merged.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x-san-cert@1614997 13f79535-47bb-0310-9956-ffa450edef68
On 1.7.x-san-cert branch, merge r1568349 from trunk.

I'm surprised this one didn't merge cleanly but it didn't.  So did it by hand
again.



git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x-san-cert@1615000 13f79535-47bb-0310-9956-ffa450edef68
On 1.7.x-san-cert: Follow up to r1614997.  Fix missing parens.


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