Merge proposals dependent on lp://qastaging/~dobey/desktopcouch/fix-mandels-broken-lint

lp://qastaging/~dobey/desktopcouch/fix-mandels-broken-lint has no merge proposals.