Cherry pick rubocop to 3-0-maintenance

Followup to #1118 ping @cupakromer