Merge proposals dependent on lp://staging/~launchpad-baby-gnu/ubumirror/feature-set-config-and-log-files-from-command-line

1. feature-set-config-and-log-files-from-command-line
2. Dependent merge proposals