ac583fce21
* Fix some old migration scripts * Fix edge case in two-step migration from older releases
* Fix some old migration scripts * Fix edge case in two-step migration from older releases