Merge r1589360 from trunk, fixing include for 1.8.x

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