Merge proposals dependent on lp://qastaging/~gary-lasker/software-center/fix-lp818306

lp://qastaging/~gary-lasker/software-center/fix-lp818306 has no merge proposals.