Merge remote-tracking branch 'upstream/pull/2177'

diff --cc Gemfile
Simple merge

diff --cc Gemfile.lock
index e7e3914177833882a4a231b2f9e144bc1d8f1e4b,702ee49a1858afd4b998afbcffc5f94ac48c4d49..2b5cc1dd5a6538be1095af7342c0d86e6436dfdb
--- 1/Gemfile.lock
--- 2/Gemfile.lock
+++ b/Gemfile.lock
@@@ -91,7 -91,11 +91,11 @@@ GE
      coffee-script-source (1.12.2)
      composite_primary_keys (11.1.0)
        activerecord (~> 5.2.1)
 -    concurrent-ruby (1.1.4)
 +    concurrent-ruby (1.1.5)
+     config (1.7.1)
+       activesupport (>= 3.0)
+       deep_merge (~> 1.2.1)
+       dry-validation (>= 0.12.2)
      coveralls (0.8.22)
        json (>= 1.8, < 3)
        simplecov (~> 0.16.1)

diff --cc test/controllers/api/changesets_controller_test.rb
Simple merge