Merge remote-tracking branch 'origin/bugfix/8325_load_log_bug'
Refs #8340 Change workspace names to use correct suffix.
Merge branch 'bugfix/8340_ApplyCor_cycle_corrections_bug' into develop