Merge proposals dependent on lp://staging/~launchpad-baby-gnu/ubumirror/feature-abort-on-remote-update-in-progress

1. feature-abort-on-remote-update-in-progress
2. Dependent merge proposals