Merge r1615255 and r1615256 from trunk to bring in 1.7.18 CHANGES entries.


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