Cleaner queuing of jobs using Delayed Job
Merge pull request #16963 from collectiveidea/activejob-dj

Cleaner queuing of jobs using Delayed Job

Conflicts:
	activejob/lib/active_job/queue_adapters/delayed_job_adapter.rb