Even more 2.3 hotfixes

Fixed some save migration issues. Fixed an SF3 issue with "Spring Water" industry.

Thanks to everyone who has been submitting bug reports, and thanks everyone for your patience while we've been working through these issues!