[167708] Some updates to consolidate server.xml handling.
2 files changed