Improved the way EditorSettingsManager persists the default/non-editor-config settings, and cleaned up the overriding of default classes