Merge pull request #14850 from chancancode/fix_json_cookie_jar

Fixed an issue with migrating legacy json cookies.
Conflicts:
	actionpack/CHANGELOG.md