[PATCH master, f18-branch] Use updated connection settings object for default auto config files (#883383)