Merge proposals dependent on lp://qastaging/~dcaro/clicompanion/fix-1035073.2

lp://qastaging/~dcaro/clicompanion/fix-1035073.2 has no merge proposals.