use amq client 5.8
Merge branch 'mbst-5423-queue-changes' into stage

* mbst-5423-queue-changes:
  use amq client 5.8