Merge proposals dependent on lp://qastaging/~aaronp/software-center/update-oneconf

lp://qastaging/~aaronp/software-center/update-oneconf has no merge proposals.