[DO NOT REVIEW] Refs #7156 - Fixing some small rubocop items