BZ-1149936 HORNETQ-1427 Avoid orphaned consumers