sync with apr trunk on minor details

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