Changed the DangerousAttributeError exception message to include messaging that the conflict could be because of a conflicting attribute.
Prepare maintenance policy for 4.2 release [ci skip]
Merge pull request #16669 from aantix/dangerous_attribute_error_better_message

Improved the error messaging for the DangerousAttributeError exception
Change ActiveJob test directory to "test/jobs"
Merge pull request #16908 from y-yagi/change_activejob_test_dir

Change ActiveJob test directory to "test/jobs" [ci skip]