Code review comment for lp:~sil2100/ubuntu-system-image/server-redirect_in_scripts

I was not asking for a revert, I was asking for the unrelated changes to be isolated into separate commits (which would require a rebase of this branch).

I've split out the refactor work into a commit and landed this separately; your branch can then land on top. This branch looks good now, and doesn't introduce testsuite regressions, so merging.