Merge proposals dependent on lp://qastaging/~silverdrake11/landscape-charm/bootstrap_account_charm_lndeng-150

1. bootstrap_account_charm_lndeng-150
2. Dependent merge proposals