[PATCH v2 2/2] configs: Re-sync with CONFIG_DISTRO_DEFAULTS