Merge proposals dependent on lp://staging/~ilidrissi.amine/update-manager/update-manager.fix-624894

1. update-manager.fix-624894
2. Dependent merge proposals