Remove Upgrade configuration remnants

Marco Cattaneorequested to merge
cherry-pick-d095788f into stripping24r2-28r2-patches

See merge request !2451 (merged) (cherry picked from commit d095788f)

Merge request reports