Complete the removal of upgrade options from the Reco configuration

Cherry picked from !1859 (merged)

To be backported also to 2016-patches reco15-patches, hlt2016-patches