Merge r1534713 from trunk with CHANGES for 1.8.4


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