Merge proposals dependent on lp:~ricotz/bamf/fix-abi

lp:~ricotz/bamf/fix-abi has no merge proposals.