QPID-5996 : Applying patch from Robbie Gemmell

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