Merge branch 'fix-settings-spec' into 'master'

Fix settings_spec so that it can that run by itself

Running `spec/settings_spec.rb` would fail because it would attempt to load `1_settings.rb`, which would reference `Rails`. This constant was not loaded without `spec_helper.rb`.


See merge request !4893