AMQ-7298 - fix regression with broker redelivery plugin, fix and test relates to AMQ-8168

(cherry picked from commit c4d2ddfce9944cff6ec4003242ce79a2e843aac8)
2 files changed