Separate out the mailer queues for delayed_job.
Merge branch 'master' into gsa