Fixes #7156 - Fixing up rubocop errors across katello
Merge pull request #4734 from daviddavis/temp/20141010134450

Fixes #7156 - Converge to one rubocop.yml