Clear attribute changes after handling locking
#26497

koppen wants to merge koppen:26496-touch_with_optimistic_locking into rails:master

We do not currently have an analysis of these two commits