QPID-4760: Associate Java Broker QueueAdapter and SessionAdapter via ConsumerAdapter

merges only the changes to the Java broker from r1476219


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