Fixes 5992 and 5993 - qpid dependencies
Merge pull request #4194 from jmontleon/update-deps-for-qpid

Fixes 5992 and 5993 - qpid dependencies