Merge remote-tracking branch 'origin/feature/9464_scale_pd'
Merge remote-tracking branch 'origin/feature/9784_engine_x_calibrate_test'
Refs #9209 Update system tests.

The workspaces should still match exactly. It's just the name of the output
workspaces that have changed.
Merge branch 'feature/9209_can_file_diffraction' into develop