Merge proposals dependent on lp://qastaging/~woodrow-shen/friendly-recovery/fix-resolvconf-not-found

1. fix-resolvconf-not-found
2. Dependent merge proposals