Merge pull request #8218 from ctiller/reduce_load

Reduce load on Jenkins from running benchmarks as tests