Minimize diff between templates and upstream default config

Note that @rabbit_settings is always defined now.