One more fix for usage tests. Refs #9571
Merge branch 'feature/9571_UsageExamples' into develop