Merge remote-tracking branch 'origin/feature/9769_NormalizeToMonitor2'
System test to cover reusing calibration workspaces

Refs #9802
Merge branch 'bugfix/9802_define_parametermap_copy_constructor' into develop