Merge pull request #10332 from AdmiralCurtiss/config-port-general Config: Port remaining General settings to new config system.
