Merge proposals dependent on lp:~marienz/ubuntu-bots/oftc-fixes

lp:~marienz/ubuntu-bots/oftc-fixes has no merge proposals.