On 1.8.x-r1581305 branch, merge r1581305 and 1581315 and resolve
text conflict in svn_dep_compat.h.


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