Merge proposals dependent on lp://qastaging/~frank-villasenor/clicompanion/bugfixes

lp://qastaging/~frank-villasenor/clicompanion/bugfixes has no merge proposals.