Update Rubocop

This change updates the Rubocop gem to the latest version
Merge branch 'update-rubocop'