Merge pull request #13751 from chancancode/ar_rollback_fix

Restore ActiveRecord states after a rollback for models w/o callbacks
Conflicts:
	activerecord/CHANGELOG.md