[TASK] Adds base_settings as a common base for settings and local_settings
Merge branch 'settings-split'