Merge proposals dependent on lp://staging/~jonathan-abdiel/ubumirror/config-fix

lp://staging/~jonathan-abdiel/ubumirror/config-fix has no merge proposals.