Issue #2821774 by tim.plunkett: MigrateUpgradeForm incorrectly using form values for multistep management (cherry picked from commit a63e8413)