Merge proposals dependent on lp://qastaging/~sil/kazam/minor-fixes

lp://qastaging/~sil/kazam/minor-fixes has no merge proposals.