Merge remote branch 'origin/feature/7644_remove_deprecation'
Merge remote branch 'origin/feature/7657_jenkins_valgrind_job'
Merge remote-tracking branch 'origin/feature/7594_correct_margin'
Merge remote branch 'origin/bugfix/7430_vtksplatterplotfactory_behavior'
Merge remote branch 'origin/feature/7658_lebailfit_tcmalloc_error'
Merge remote-tracking branch 'origin/feature/7660_replace_py_with_log_alg'
Merge remote-tracking branch 'origin/feature/3189_refactor_loadLog_processing_to_loadRawHelper'
Merge remote-tracking branch 'origin/bugfix/7600_sans2d_add'
Merge remote-tracking branch 'origin/feature/7603_calib_wish'
Return the old logic.

Refs #7720
Merge branch 'bugfix/7720_gui_prop_use_default' into develop