Fixes #5700: Fixes rubocop error introduced by PR 4070.
Merge pull request #4074 from ehelms/fixes-5700

Fixes #5700: Fixes rubocop error introduced by PR 4070.
Merge remote branch 'origin/master' into master-to-roles