Server leaks memory when messages are expired without an expiry-address

When messages are being expired from an address that has an empty expiry-address they should be dropped. At the moment what happens is that the broker logs a message indicating that the message is being dropped:

AMQ222146: Message has expired. No bindings for Expiry Address  so dropping it 

However, the messages are never acknowledged so they end up showing as in delivery. ExpiredCount for the queue is never incremented while DeliveringCount is. This results in increased memory consumption and as the amount of expiring messages increase the broker eventually runs out of memory.