Merge proposals dependent on lp://qastaging/~mvo/ubuntu-release-upgrader/fix-component-ordering

1. fix-component-ordering
2. Dependent merge proposals