Merge pull request #10348 from AdmiralCurtiss/config-remove-compare-server-client Config: Remove CompareServer and CompareClient settings.