Add test to prevent breaking the main conf
Add all of Debian's config dirs to the main config file

Not adding them breaks upstreams configurations
Merge branch 'upstreams_conf_issue'