Merge proposals dependent on lp://qastaging/~rbalint/update-manager/lp-1795898-upgrade-workaround

1. lp-1795898-upgrade-workaround
2. Dependent merge proposals