Fixes #7022 - Upgrade version of rubocop