Merge proposals dependent on lp://qastaging/~simpoir/landscape-charm/1682105_revisit_config

lp://qastaging/~simpoir/landscape-charm/1682105_revisit_config has no merge proposals.