SSP-2833 WIP. Nearly complete email batching and retry logic