Fixes #8593 - remove N+1 queries on puppetclass index page
(cherry picked from commit 0e5fefb087492c926e32417039528d0a105d51a0)
Fixes #8593 - remove N+1 queries on puppetclass index page
(cherry picked from commit 0e5fefb087492c926e32417039528d0a105d51a0)