Update w/ proposed backports


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.5.x@1529899 13f79535-47bb-0310-9956-ffa450edef68