Regression: DEFAULT_DELIVERY_MODE no longer honored, also use Exchange.delivery_mode if set.  Closes #1953