Fixes #5435: Allows upgrade to boot on old schemas
Merge pull request #5436 from mrclay/5435

Fixes #5435: Allows upgrade to boot on old schemas