Commit the mergeinfo that I apparently negelected to commit in r1615248.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x@1615254 13f79535-47bb-0310-9956-ffa450edef68
Merge r1615255, r1615256, r1615260 from trunk to bring in 1.7.18 and 1.8.10 CHANGES.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x@1615262 13f79535-47bb-0310-9956-ffa450edef68
Merge the following get-deps.sh changes from trunk:

r1552957, r1552958: Use a stable URL for zlib.
r1566504: Bump serf version to 1.3.4
r1572340, r1615263: Bump httpd to 2.4.10


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