Fix upgrade scenario

[emkll]

Status

Ready for review

Description of Changes

Fixes #4125

Testing

Run the upgrade testing scenario and ensure it completes successfully:

rm -r build/*
make build-debs
make upgrade-start
make upgrade-test-local

• make upgrade-test-local completes without error on this branch.

Deployment

Dev env only

Checklist

If you made non-trivial code changes:

• I have written a test plan and validated it for this PR

[codecov-io]

Codecov Report

Merging #4126 into develop will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff            @@
##           develop    #4126   +/-   ##
========================================
  Coverage    84.77%   84.77%           
========================================
  Files           43       43           
  Lines         2779     2779           
  Branches       303      303           
========================================
  Hits          2356     2356           
  Misses         355      355           
  Partials        68       68

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update f6f6ea2...2b5aefe. Read the comment docs.

[heartsucker]

Ran through the test plan and this looks good to me.