Fixes 5992 and 5993 - qpid dependencies