merge r1389077 (minus the apr-util bits) from trunk

easy fixes for a few warnings about unused variables


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