Expiry delay is not applyed to all queues on AMQ Broker

Issue

• The expiry-delay configured in address-setting is not applied to all queues if a more specific match is defined

• in the following configuration expiry delay will not be applied on the testaddress.queue.test

           <address-setting match="#">
              <expiry-delay>604800000</expiry-delay>
  
  
           <address-setting match="testaddress.queue.test">
             <max-size-bytes>12428800</max-size-bytes>