Correct failing builds

Refs #10441
Merge branch 'feature/10441_refactor_spectrum_viewer' into develop