Backport: fix upgrade script for 1.17

[Donnype]

Changes

See #3824.

This PR backports the fixes of the upgrade script to v1.17.

Issue link

See #3824

Demo

QA notes

See the other PR! #3824

---

Code Checklist

• All the commits in this PR are properly PGP-signed and verified.
• This PR only contains functionality relevant to the issue.
• I have written unit tests for the changes or fixes I made.
• I have checked the documentation and made changes where necessary.
• I have performed a self-review of my code and refactored it to the best of my abilities.

---

Checklist for code reviewers:

Copy-paste the checklist from the docs/source/templates folder into your comment.

---

Checklist for QA:

Copy-paste the checklist from the docs/source/templates folder into your comment.