Merge proposals dependent on lp://qastaging/~bdfhjk/clicompanion/sudo-control-add

lp://qastaging/~bdfhjk/clicompanion/sudo-control-add has no merge proposals.