Merge proposals dependent on lp://qastaging/~landscape/landscape-charm/bundles-trunk-new-charm

1. bundles-trunk-new-charm
2. Dependent merge proposals