QPID-5419 : Applied patch from Timothy Bish

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