[breaking change] Unify services and servers.

There is now only one module set, only one #modules block in the config
DSL (replacing #services and #servers), and services and servers get the
same constructor arguments.