[CHEF-4117] backport Resource class deletion scope fix to 10.x
Merge branch 'CHEF-4117-10-stable' into 10-stable