Refs #9836 - Fix system tests.
Merge branch 'bugfix/9836_more_y_unit_label_corrections' into develop