Merge proposals dependent on lp:~charlesk/bamf/fix-937402

lp:~charlesk/bamf/fix-937402 has no merge proposals.