Fixes #7022 - Upgrade version of rubocop
Merge pull request #4565 from daviddavis/7022

Fixes #7022 - Upgrade version of rubocop