Merge proposals dependent on lp://staging/~michael-sheldon/ubuntu-download-manager/fix-1628635

1. fix-1628635
2. Dependent merge proposals