Merge proposals dependent on lp://staging/~thumper/launchpad/update-existing-stacked-branches

1. update-existing-stacked-branches
2. Dependent merge proposals