QPID-6069: FreeBSD compilation problems
[merged from trunk r1622369, r1622397]

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.30@1622553 13f79535-47bb-0310-9956-ffa450edef68