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

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