Merge proposals dependent on lp://qastaging/~rbalint/update-manager/lp-1795898-lp-1790670-cosmic

1. lp-1795898-lp-1790670-cosmic
2. Dependent merge proposals