QPID-5829: This rearrangement is really it...

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