Include server in config_database.  Add namespace to build_cmd_environment.