Code review comment for lp://staging/~barry/ubuntu-system-image/reload-configuration

I should mention that while I think this will do what you want in the immediate case, we'll have to work out something different for si 3.0, which will have the config.d/ directory support (soon to land in trunk). So consider this expedient rather than permanent.

Oh, and I fixed the test suite so now you can run `tox` again. :)