Merge proposals dependent on lp://staging/~dobey/aptdaemon/fix-imports

lp://staging/~dobey/aptdaemon/fix-imports has no merge proposals.