Merge r1643972 and r1643973 from trunk to bring CHANGES up to date.


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