Merge apr-util 1.5.3 -> 1.5.4.  A minor bug fix update.


git-svn-id: svn+ssh://svn.freebsd.org/base/head@272076 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f