Fix stray benchmark_grade references to old Course attributes
Fix benchmark_grade category-as-course Aggregate deathmatch