QPID-5048: assembly and dependency fixups

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