Merge pull request #12791 from jasonayre/ja/fix_autoload_error

add autoload :TransactionState to fix Marshal.load issues
Conflicts:
	activerecord/CHANGELOG.md