Refs #7156 - Fixing a bunch of small rubocop items