Merge remote-tracking branch 'upstream/staging/electro-release' into staging/electro-release
Remove rubocop because it causes backtrace

MSP-11046

See https://gist.github.com/limhoff-r7/7c398b5f4c44ed40cf1f
Fix typo

MSP-11046

`ActiveSupport::OrderedOptions` automatically create an attribute for
any missing keys, so when `options.console.resource` was used it would
return `nil` instead of the erroring.  The correct option name was
`options.console.resources` (note the pluralization).
Merge pull request #3641 from limhoff-r7/bug/MSP-11046/resource

MSP-11046 #land