Add unit test for 4 to 5 upgrade, disable upgrading from the controller for now, and move some store cleanup code to the upgrade.