Apply Rails security patch and remove remaining RuboCop TODOs

In this case alone, the longer form definitely appears more complicated than the smaller form... Could we disable this check for now? Because functionally it doesn't seem to make any difference, whereas the Ruby style guide says to avoid this with the intent of catching [specific exceptions](https://github.com/bbatsov/ruby-style-guide#no-rescue-modifiers).