Merge proposals dependent on lp://qastaging/~toabctl/update-manager/fix-local-var-before-assignment

1. fix-local-var-before-assignment
2. Dependent merge proposals