Merge remote branch 'origin/feature/7481_add_log_level_opt_to_system_tests'
Re #7481. Addition required to use the new option.
Re #7143 Fix system test
Merge branch 'feature/7143_fix_calibrate_sys_test' into develop