Slowly refactor remaining queue2civicrm_stomp.inc calls to use the new Queue stuff

Change-Id: I166661cf2a598f1dc9bd4219ac8fd328a1a3e842