Use single copy of Settings.config in distribution.
Merge branch 'self-host' into broccoli