Remove Upgrade configuration remnants

Marco Cattaneorequested to merge
cherry-pick-096daedb into hlt2016-patches

See merge request !2464 (merged) (cherry picked from commit 096daedb)

Merge request reports