Move around AR::Dirty and fix _attribute method
#28760

tenderlove wants to merge fix-attributes_name into master

We do not currently have an analysis of these two commits