Clean-up and refactor of the Config.server_maker() code.
Clean-up and refactor of the Config.server_maker() code.

lrem/phdoc,zacharyvoase/markdoc,snoozbuster/markdoc,wlonk/markdoc,lrem/phdoc,wlonk/markdoc,snoozbuster/markdoc