Also, the section on `server.*` configuration was poor so this commit also improves it. Closes gh-4989
