Merge pull request #2840 from kgaillot/term
Remove more legacy terminology from scheduler regression test inputs