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

lp://qastaging/~ericsnowcurrently/landscape-charm/trunk has no merge proposals.