Merge proposals dependent on lp://qastaging/casper-guada

lp://qastaging/casper-guada has no merge proposals.