Merge pull request #1892 from clebertsuconic/2.3.x

BZ-1149936 HORNETQ-1427 Avoid orphaned consumers