Fix rubocop issues preventing successful builds in master.
Merge pull request #2997 from waldenraines/fix-rubocop

Fix rubocop issues preventing successful builds in master.