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

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