Adjust upgrade file rendering
minor #12501 Adjust upgrade file rendering & backport missing notes (stloyd)

This PR was merged into the 2.3 branch.

Discussion
----------

Adjust upgrade file rendering & backport missing notes

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| License       | MIT

Commits
-------

d9c2e6d Adjust upgrade file rendering