Merge pull request #18266 from cristianbica/ajfixes

ActiveJob testing improvements
Conflicts:
	activejob/test/cases/adapter_test.rb