Merge proposals dependent on lp://qastaging/~thekorn/ubuntu-dev-tools/fix_import_common

lp://qastaging/~thekorn/ubuntu-dev-tools/fix_import_common has no merge proposals.