Refs #7156 - Fixing a bunch of small rubocop items
Merge pull request #4643 from daviddavis/rubocop-low-hanging

Refs #7156 - Fixing a bunch of small rubocop items