make cust_pay upgrade more tolerant about payment gateways
allow location change when the package definition has been disabled, #22365, #940
keep package discounts during location change, #22364