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

diff --cc .rubocop_todo.yml
Simple merge

diff --cc app/controllers/changeset_controller.rb
Simple merge

diff --cc test/controllers/changeset_controller_test.rb
Simple merge